Checkbox

Merge lp:~kelemeng/checkbox/bug636733 into lp:checkbox

  1. bug636733
  2. Merge into trunk
Proposed by Gabor Kelemen
Status: Rejected
Rejected by: Daniel Manrique
Proposed branch: lp:~kelemeng/checkbox/bug636733
Merge into: lp:checkbox
Diff against target: 18 lines (+2/-2)
1 file modified
plugins/backend_info.py (+2/-2)
To merge this branch: bzr merge lp:~kelemeng/checkbox/bug636733
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Disapprove
Review via email: mp+36218@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Hi,

This code looks good, and to be fair it was submitted first, but the fact is, this problem was fixed in code associated with bug 776712 and is already present in the latest development version of checkbox. Thus the "disapprove", not as to indicate the code is bad, but in order to avoid duplication and not keep this branch around.

review: Disapprove

Unmerged revisions

859. By Gabor Kelemen

Invoke gksu/kdesudo with --desktop argument. Fixes LP: 636733

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/backend_info.py'
2--- plugins/backend_info.py 2010-04-20 16:23:16 +0000
3+++ plugins/backend_info.py 2010-09-21 21:31:15 +0000
4@@ -57,13 +57,13 @@
5 stdout=PIPE, stderr=PIPE) == 0 and \
6 call(["pgrep", "-x", "-u", str(uid), "ksmserver"],
7 stdout=PIPE, stderr=PIPE) == 0:
8- prefix = ["kdesudo", "--"]
9+ prefix = ["kdesudo", "--desktop", "/usr/share/applications/checkbox-gtk.desktop", "--"]
10 elif os.getenv("DISPLAY") and \
11 call(["which", "gksu"],
12 stdout=PIPE, stderr=PIPE) == 0 and \
13 call(["pgrep", "-x", "-u", str(uid), "gnome-panel|gconfd-2"],
14 stdout=PIPE, stderr=PIPE) == 0:
15- prefix = ["gksu", "--"]
16+ prefix = ["gksu", "--description", "/usr/share/applications/checkbox-gtk.desktop", "--"]
17 else:
18 prefix = ["sudo"]
19

Subscribers

People subscribed via source and target branches