Merge lp:~brendan-donegan/checkbox/gconf_resource_fix into lp:checkbox

[Brendan Donegan]

This simply redirects STDERR to PIPE in the gconf_resource script to avoid the error message making checkbox puke.

[Marc Tardif (cr3)]

That works, thanks!

review: Approve

[Marc Tardif (cr3)]

By the way, when fixing a bug, it's usually a good idea to mention it in the debian/changelog file. I'll do that for you when merging.

=== modified file 'scripts/gconf_resource'
--- scripts/gconf_resource	2010-02-16 15:18:39 +0000
+++ scripts/gconf_resource	2011-09-09 10:20:25 +0000
@@ -42,7 +42,7 @@
     # TODO: add support for multi-line values
 
     gconf = {}
-    output = Popen(command, stdout=PIPE, shell=True).communicate()[0]
+    output = Popen(command, stdout=PIPE, stderr=PIPE, shell=True).communicate()[0]
     for line in output.split("\n"):
         if not line:
             continue