Merge lp:~nathwill-deactivatedaccount-deactivatedaccount/checkbox/lp988260 into lp:checkbox

[Nathan Williams]

wrap call(command) in try/catch to handle zenity absence (lp: #988260)

[Daniel Manrique (roadmr)]

Thanks for your contribution to checkbox!

This code looks fine, I do have a request for the message you show when zenity is not found. The current message doesn't give much of a clue about why zenity is important, and people may confuse this with the result of the test.

I wonder if you could update it so it explains more clearly why zenity is needed and what the consequence will be. Maybe something like "unable to report test results since zenity is not installed" may work better. I leave it to your criteria.

Thanks again!

review: Needs Fixing

[lp:~nathwill-deactivatedaccount-deactivatedaccount/checkbox/lp988260]

1559. By Nathan Williams on 2012-08-08

explain error, display results if missing zenity

[Nathan Williams (nathwill-deactivatedaccount-deactivatedaccount)]

Thanks for the tip. Updated the warning to be more helpful.

review: Needs Resubmitting

[Daniel Manrique (roadmr)]

Thanks!

One more correction needed: if I run it I get this:
  File "scripts/network_check", line 60
    print "Zenity missing; unable to report test result:\n %s" % message
                                                             ^
SyntaxError: invalid syntax

Note that this has been converted to Python 3, and since print is now a function and not a statement, you'd have to enclose it in parentheses so it runs correctly:

    print("Zenity missing; unable to report test result:\n %s" % message)

Once that's done this can be merged. It's a small change but I thought it best to bring it to your attention.

Thanks!

review: Needs Fixing

[lp:~nathwill-deactivatedaccount-deactivatedaccount/checkbox/lp988260]

1560. By Nathan Williams on 2012-08-08

explain error,display results if missing zenity in py3 compatible fashion

[Nathan Williams (nathwill-deactivatedaccount-deactivatedaccount)]

py3: 1, nathwill: 0

review: Needs Resubmitting

[Daniel Manrique (roadmr)]

Great! Thanks so much.

Merging into trunk. Note that I added a changelog entry detailing your changes and linking to the fixed bug.

Thanks for your contribution!

review: Approve

=== modified file 'scripts/network_check'
--- scripts/network_check	2012-07-25 19:30:54 +0000
+++ scripts/network_check	2012-08-08 15:56:22 +0000
@@ -54,7 +54,10 @@
         command.append("--error")
 
     if not args.auto:
-        call(command)
+        try:
+            call(command)
+        except OSError:
+            print("Zenity missing; unable to report test result:\n %s" % message)
 
     if any(results.values()):
         return 0