Merge lp:~frankban/juju-quickstart/minor-typos into lp:juju-quickstart

Proposed by Francesco Banconi
Status: Merged
Merged at revision: 93
Proposed branch: lp:~frankban/juju-quickstart/minor-typos
Merge into: lp:juju-quickstart
Diff against target: 64 lines (+13/-15)
3 files modified
quickstart/app.py (+2/-4)
quickstart/manage.py (+4/-4)
quickstart/models/envs.py (+7/-7)
To merge this branch: bzr merge lp:~frankban/juju-quickstart/minor-typos
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+231771@code.launchpad.net

Description of the change

Minor fixes in preparation for release.

https://codereview.appspot.com/125640043/

To post a comment you must log in.
Revision history for this message
Francesco Banconi (frankban) wrote :
Download full text (4.1 KiB)

Reviewers: mp+231771_code.launchpad.net,

Message:
Please take a look.

Description:
Minor fixes in preparation for release.

https://code.launchpad.net/~frankban/juju-quickstart/minor-typos/+merge/231771

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/125640043/

Affected files (+15, -15 lines):
   A [revision details]
   M quickstart/app.py
   M quickstart/manage.py
   M quickstart/models/envs.py

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision:
<email address hidden>

Index: quickstart/app.py
=== modified file 'quickstart/app.py'
--- quickstart/app.py 2014-08-01 15:35:56 +0000
+++ quickstart/app.py 2014-08-21 16:24:05 +0000
@@ -192,11 +192,9 @@
      if upload_tools:
          cmd.append('--upload-tools')
      if upload_series is not None:
- cmd.append('--upload-series')
- cmd.append(upload_series)
+ cmd.extend(['--upload-series', upload_series])
      if constraints is not None:
- cmd.append('--constraints')
- cmd.append(constraints)
+ cmd.extend(['--constraints', constraints])
      retcode, _, error = utils.call(*cmd)
      if retcode:
          # XXX frankban 2013-11-13 bug 1252322: the check below is weak. We
are

Index: quickstart/manage.py
=== modified file 'quickstart/manage.py'
--- quickstart/manage.py 2014-08-21 13:36:32 +0000
+++ quickstart/manage.py 2014-08-21 16:23:26 +0000
@@ -463,11 +463,11 @@
          help='upload tools for supplied comma-separated series list')
      parser.add_argument(
          '--constraints',
- help='If constraints are specified in the bootstrap command,\n'
- 'they will apply to the machine provisioned for the juju
state\n'
- 'server. They will also be set as default constraints on
the\n'
+ help='If constraints are specified, they will apply to the
machine\n'
+ 'provisioned for the Juju state server. \n'
+ 'They will also be set as default constraints on the\n'
               'environment for all future machines, exactly as if the\n'
- 'constraints were set with juju set-constraints.\n')
+ 'constraints were set with "juju set-constraints".\n')
      # Parse the provided arguments.
      options = parser.parse_args()

Index: quickstart/models/envs.py
=== modified file 'quickstart/models/envs.py'
--- quickstart/models/envs.py 2014-08-21 13:40:09 +0000
+++ quickstart/models/envs.py 2014-08-21 16:23:26 +0000
@@ -685,15 +685,15 @@
                  default='lxcbr0', help='the LXC bridge interface to use'),
              fields.BoolField(
                  'lxc-clone', label='use lxc-clone', required=False,
- help='use lxc-clone to create the containers '
- 'used as machines. LXC clone is enabled by default for
Trusty '
- 'and above, and disabled for earlier Ubuntu releases.'),
+ help='Us...

Read more...

Revision history for this message
Francesco Banconi (frankban) wrote :

Self review trivial + urgent.

https://codereview.appspot.com/125640043/

Revision history for this message
Francesco Banconi (frankban) wrote :

*** Submitted:

Minor fixes in preparation for release.

R=
CC=
https://codereview.appspot.com/125640043

https://codereview.appspot.com/125640043/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'quickstart/app.py'
--- quickstart/app.py 2014-08-01 15:35:56 +0000
+++ quickstart/app.py 2014-08-21 16:26:17 +0000
@@ -192,11 +192,9 @@
192 if upload_tools:192 if upload_tools:
193 cmd.append('--upload-tools')193 cmd.append('--upload-tools')
194 if upload_series is not None:194 if upload_series is not None:
195 cmd.append('--upload-series')195 cmd.extend(['--upload-series', upload_series])
196 cmd.append(upload_series)
197 if constraints is not None:196 if constraints is not None:
198 cmd.append('--constraints')197 cmd.extend(['--constraints', constraints])
199 cmd.append(constraints)
200 retcode, _, error = utils.call(*cmd)198 retcode, _, error = utils.call(*cmd)
201 if retcode:199 if retcode:
202 # XXX frankban 2013-11-13 bug 1252322: the check below is weak. We are200 # XXX frankban 2013-11-13 bug 1252322: the check below is weak. We are
203201
=== modified file 'quickstart/manage.py'
--- quickstart/manage.py 2014-08-21 13:36:32 +0000
+++ quickstart/manage.py 2014-08-21 16:26:17 +0000
@@ -463,11 +463,11 @@
463 help='upload tools for supplied comma-separated series list')463 help='upload tools for supplied comma-separated series list')
464 parser.add_argument(464 parser.add_argument(
465 '--constraints',465 '--constraints',
466 help='If constraints are specified in the bootstrap command,\n'466 help='If constraints are specified, they will apply to the machine\n'
467 'they will apply to the machine provisioned for the juju state\n'467 'provisioned for the Juju state server. \n'
468 'server. They will also be set as default constraints on the\n'468 'They will also be set as default constraints on the\n'
469 'environment for all future machines, exactly as if the\n'469 'environment for all future machines, exactly as if the\n'
470 'constraints were set with juju set-constraints.\n')470 'constraints were set with "juju set-constraints".\n')
471 # Parse the provided arguments.471 # Parse the provided arguments.
472 options = parser.parse_args()472 options = parser.parse_args()
473473
474474
=== modified file 'quickstart/models/envs.py'
--- quickstart/models/envs.py 2014-08-21 13:40:09 +0000
+++ quickstart/models/envs.py 2014-08-21 16:26:17 +0000
@@ -685,15 +685,15 @@
685 default='lxcbr0', help='the LXC bridge interface to use'),685 default='lxcbr0', help='the LXC bridge interface to use'),
686 fields.BoolField(686 fields.BoolField(
687 'lxc-clone', label='use lxc-clone', required=False,687 'lxc-clone', label='use lxc-clone', required=False,
688 help='use lxc-clone to create the containers '688 help='Use lxc-clone to create the containers used as '
689 'used as machines. LXC clone is enabled by default for Trusty '689 'machines. LXC clone is enabled by default for Trusty '
690 'and above, and disabled for earlier Ubuntu releases.'),690 'and above, and disabled for earlier Ubuntu releases.'),
691 fields.BoolField(691 fields.BoolField(
692 'lxc-clone-aufs', label='use lxc-clone-aufs', required=False,692 'lxc-clone-aufs', label='use lxc-clone-aufs', required=False,
693 help='use aufs as a backing-store for the '693 help='Use aufs as a backing-store for the LXC clones. Note '
694 'LXC clones, but there are some situations where aufs '694 "that there are some situations where aufs doesn't "
695 "doesn't entirely behave as intuitively as one might "695 'entirely behave as intuitively as one might expect. '
696 'expect. If not specified, aufs is not used.'),696 'If not specified, aufs is not used.'),
697 is_default_field,697 is_default_field,
698 ),698 ),
699 }699 }

Subscribers

People subscribed via source and target branches