Merge lp:~frankban/charms/precise/juju-gui/charmers-upgrade-13-08 into lp:~juju-gui/charms/precise/juju-gui/trunk

[Francesco Banconi]

Fix for the upgrade-charm story.

The builtin-server option is not included
in the previous configuration.

https://codereview.appspot.com/13300045/

[Francesco Banconi (frankban)]

Reviewers: mp+183165_code.launchpad.net,

Message:
Please take a look.

Description:
Fix for the upgrade-charm story.

The builtin-server option is not included
in the previous configuration.

https://code.launchpad.net/~frankban/charms/precise/juju-gui/charmers-upgrade-13-08/+merge/183165

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M hooks/backend.py
   M revision

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: revision
=== modified file 'revision'
--- revision 2013-08-29 16:26:12 +0000
+++ revision 2013-08-30 13:21:52 +0000
@@ -1,1 +1,1 @@
-78
+79

Index: hooks/backend.py
=== modified file 'hooks/backend.py'
--- hooks/backend.py 2013-08-29 16:23:50 +0000
+++ hooks/backend.py 2013-08-30 13:20:46 +0000
@@ -270,7 +270,7 @@
          self.mixins.append(GuiMixin())
          # TODO: eventually this option will go away, as well as haproxy and
          # Apache.
- if config['builtin-server']:
+ if config.get('builtin-server', False):
              self.mixins.append(BuiltinServerMixin())
          else:
              self.mixins.append(HaproxyApacheMixin())

[Francesco Banconi (frankban)]

LGTM self-review: trivial.

https://codereview.appspot.com/13300045/

[Francesco Banconi (frankban)]

*** Submitted:

Fix for the upgrade-charm story.

The builtin-server option is not included
in the previous configuration.

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

https://codereview.appspot.com/13300045/

=== modified file 'hooks/backend.py'
--- hooks/backend.py	2013-08-29 16:23:50 +0000
+++ hooks/backend.py	2013-08-30 13:23:36 +0000
@@ -270,7 +270,7 @@
         self.mixins.append(GuiMixin())
         # TODO: eventually this option will go away, as well as haproxy and
         # Apache.
-        if config['builtin-server']:
+        if config.get('builtin-server', False):
             self.mixins.append(BuiltinServerMixin())
         else:
             self.mixins.append(HaproxyApacheMixin())

=== modified file 'revision'
--- revision	2013-08-29 16:26:12 +0000
+++ revision	2013-08-30 13:23:36 +0000
@@ -1,1 +1,1 @@
-78
+79