Merge lp:~sylvain-pineau/checkbox/fix-1473941 into lp:checkbox

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 4471
Merged at revision: 4471
Proposed branch: lp:~sylvain-pineau/checkbox/fix-1473941
Merge into: lp:checkbox
Diff against target: 23 lines (+6/-0)
1 file modified
plainbox/plainbox/impl/ctrl.py (+6/-0)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/fix-1473941
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+303099@code.launchpad.net

Description of the change

Fixes the linked bug

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved. I'll push a post release to pypi to make use of it to build snaps.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plainbox/plainbox/impl/ctrl.py'
--- plainbox/plainbox/impl/ctrl.py 2016-06-20 11:31:35 +0000
+++ plainbox/plainbox/impl/ctrl.py 2016-08-17 08:10:21 +0000
@@ -1279,6 +1279,9 @@
1279 # Doesn't work for windows jobs1279 # Doesn't work for windows jobs
1280 if 'win32' in job.get_flag_set():1280 if 'win32' in job.get_flag_set():
1281 return -11281 return -1
1282 # Doesn't work with snappy
1283 if (os.getenv("SNAP") or os.getenv("SNAP_APP_PATH")):
1284 return -1
1282 # Only makes sense with jobs that need to run as another user1285 # Only makes sense with jobs that need to run as another user
1283 # Promote this controller only if the trusted launcher is authorized to1286 # Promote this controller only if the trusted launcher is authorized to
1284 # run jobs as another user1287 # run jobs as another user
@@ -1374,6 +1377,9 @@
1374 # Doesn't work for windows jobs1377 # Doesn't work for windows jobs
1375 if 'win32' in job.get_flag_set():1378 if 'win32' in job.get_flag_set():
1376 return -11379 return -1
1380 # Doesn't work with snappy
1381 if (os.getenv("SNAP") or os.getenv("SNAP_APP_PATH")):
1382 return -1
1377 if job.user is not None:1383 if job.user is not None:
1378 return 11384 return 1
1379 else:1385 else:

Subscribers

People subscribed via source and target branches