Remove deprecated streams directory #6441
Conversation
| @@ -61,21 +62,16 @@ use the --clean option. | |||
| Examples: | |||
|
|
|||
| - generate metadata for "released" tools, looking in the "releases" directory: | |||
There was a problem hiding this comment.
Pretty sure this shouldn't said "releases" now. Can the default value (envtools.ReleasedStream) be substituted in?
| @@ -61,21 +62,16 @@ use the --clean option. | |||
| Examples: | |||
|
|
|||
| - generate metadata for "released" tools, looking in the "releases" directory: | |||
|
|
|||
| juju metadata generate-tools -d <workingdir> | |||
| juju metadata generate-tools -d <workingdir> | |||
|
|
|||
| - generate metadata for "released" tools, looking in the "released" directory: | |||
There was a problem hiding this comment.
Not your change I know but can we get rid of the word "directory" in these examples. It's confusing.
It would be enough to just say:
- generate metadata for "released" tools
Also, in other help examples, the comments tend to start with #. Can you please make this consistent while you're in here?
kat-co
force-pushed
the
fixes-1613858-metadata-generate
branch
from
978c070 to
93e7a5d
Compare
|
|
||
| - generate metadata for "proposed": |
kat-co
force-pushed
the
fixes-1613858-metadata-generate
branch
from
93e7a5d to
740114d
Compare
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
|
Build failed: Tests failed |
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
This addresses lp:1613858. When running `juju metadata generate-tools`, Juju would attempt to look in a deprecated path "releases" for tools to generate streams. If you specified a value in the `--stream` flag (e.g. "devel"), Juju would work correctly. This was because we set this flag to the 1.x default of "releases" (notice: not "released"). This patch sets the default of the `stream` flag to envtools.ReleasedStream to give some transparancy to the user and follow a more common idiom. This also fixes the bug. I also added some `errors.Trace` around error paths in the functions I touched.
kat-co
force-pushed
the
fixes-1613858-metadata-generate
branch
from
740114d to
fa54768
Compare
|
Build failed: Tests failed |
|
Actual fix. |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
This addresses lp:1613858.
When running
juju metadata generate-tools, Juju would attempt to look in a deprecated path "releases" for tools to generate streams. If you specified a value in the--streamflag (e.g. "devel"), Juju would work correctly. This was because we set this flag to the 1.x default of "releases" (notice: not "released").This patch sets the default of the
streamflag to envtools.ReleasedStream to give some transparancy to the user and follow a more common idiom. This also fixes the bug.I also added some
errors.Tracearound error paths in the functions I touched.