Merge lp:~ben-mendis/wicd/fix-exit-status into lp:wicd/1.6

[Ben the Pyrate]

Exit with a non-zero status (6) when a connection attempt does not succeed.

(This is my first time submitting a pull-request on LP, please let me know if I've gotten the process wrong.)

[Pieter Leclerc (pieterleclerc-deactivatedaccount)]

Tested.

Some comments (a list of the exit codes) would have been nice, and the output (always "done!") is not consistent with the exit code (0 or 6), but it is an improvement over the status quo so I've merged it already. Keep those improvements coming!

review: Approve

[Pieter Leclerc (pieterleclerc-deactivatedaccount)]

Tested.

Some comments (a list of the exit codes) would have been nice, and the output (always "done!") is not consistent with the exit code (0 or 6), but it is an improvement over the status quo so I've merged it already. Keep those improvements coming!

review: Approve

=== modified file 'cli/wicd-cli.py'
--- cli/wicd-cli.py	2012-11-17 00:07:08 +0000
+++ cli/wicd-cli.py	2014-08-19 15:59:45 +0000
@@ -25,6 +25,8 @@
 
 misc.RenameProcess('wicd-cli')
 
+exit_status = 0
+
 if getattr(dbus, 'version', (0, 0, 0)) < (0, 80, 0):
     import dbus.glib
 else:
@@ -278,6 +280,8 @@
                 print message()
                 last = next_
         print "done!"
+        if status() != u'done':
+            exit_status = 6
         op_performed = True
 
 def str_properties(prop):
@@ -313,3 +317,5 @@
 if not op_performed:
     print "No operations performed."
 
+sys.exit(exit_status)
+