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

[Francesco Banconi]

Minor fixes in preparation for release.

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

[Francesco Banconi (frankban)]

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...

[Francesco Banconi (frankban)]

Self review trivial + urgent.

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

[Francesco Banconi (frankban)]

*** Submitted:

Minor fixes in preparation for release.

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

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

=== 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 @@
     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

=== 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 @@
         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()
 

=== 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 @@
                 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='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.'),
             fields.BoolField(
                 'lxc-clone-aufs', label='use lxc-clone-aufs', required=False,
-                help='use aufs as a backing-store for the '
-                     'LXC clones, but there are some situations where aufs '
-                     "doesn't entirely behave as intuitively as one might "
-                     'expect. If not specified, aufs is not used.'),
+                help='Use aufs as a backing-store for the LXC clones. Note '
+                     "that there are some situations where aufs doesn't "
+                     'entirely behave as intuitively as one might expect. '
+                     'If not specified, aufs is not used.'),
             is_default_field,
         ),
     }