Checkbox

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

  1. gconf_resource_fix
  2. Merge into trunk
Proposed by Brendan Donegan
Status: Merged
Merged at revision: 1037
Proposed branch: lp:~brendan-donegan/checkbox/gconf_resource_fix
Merge into: lp:checkbox
Diff against target: 12 lines (+1/-1)
1 file modified
scripts/gconf_resource (+1/-1)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/gconf_resource_fix
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+74749@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

That works, thanks!

review: Approve
Revision history for this message
Marc Tardif (cr3) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/gconf_resource'
2--- scripts/gconf_resource 2010-02-16 15:18:39 +0000
3+++ scripts/gconf_resource 2011-09-09 10:20:25 +0000
4@@ -42,7 +42,7 @@
5 # TODO: add support for multi-line values
6
7 gconf = {}
8- output = Popen(command, stdout=PIPE, shell=True).communicate()[0]
9+ output = Popen(command, stdout=PIPE, stderr=PIPE, shell=True).communicate()[0]
10 for line in output.split("\n"):
11 if not line:
12 continue

Subscribers

People subscribed via source and target branches