Ubuntu Pastebin

Paste from aim at Fri, 25 Nov 2016 16:35:35 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
$ git diff add-juju-bridge.py
diff --git a/provider/maas/add-juju-bridge.py b/provider/maas/add-juju-bridge.py
index 7a41b93..310b43e 100755
--- a/provider/maas/add-juju-bridge.py
+++ b/provider/maas/add-juju-bridge.py
@@ -421,20 +421,20 @@ def main(args):
     parser = NetworkInterfaceParser(args.filename)
     stanzas = parser.bridge(interfaces, args.bridge_prefix, args.bridge_name)
 
-    if not args.activate:
-        print_stanzas(stanzas)
-        exit(0)
-
     cur = StringIO()
     new = StringIO()
 
     print_stanzas(stanzas, new)
     print_stanzas(parser.stanzas(), cur)
 
-    if cur.getvalue() == new.getvalue():
+    if cur.getvalue() == new.getvalue() and args.activate:
         # nothing changed
         exit(0)
 
+    if not args.activate:
+        print_stanzas(stanzas)
+        exit(0)
+
     if args.one_time_backup:
         backup_file = "{}-before-add-juju-bridge".format(args.filename)
         if not os.path.isfile(backup_file):
Download as text