Apport

Merge lp:~xnox/apport/fix-cgroup into lp:~apport-hackers/apport/trunk

  1. fix-cgroup
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 2776
Proposed branch: lp:~xnox/apport/fix-cgroup
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: 15 lines (+2/-2)
1 file modified
apport/report.py (+2/-2)
To merge this branch: bzr merge lp:~xnox/apport/fix-cgroup
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+212282@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! Merged with a NEWS entry.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apport/report.py'
2--- apport/report.py 2014-01-20 14:41:03 +0000
3+++ apport/report.py 2014-03-22 11:41:21 +0000
4@@ -1589,9 +1589,9 @@
5 for l in f:
6 if 'name=systemd:' in l:
7 my_cgroup = l.split('systemd:', 1)[1].strip()
8+ if len(my_cgroup) < 2:
9+ return None
10 break
11- if len(my_cgroup) < 2:
12- return None
13 else:
14 return None
15 # determine cgroup creation time

Subscribers

People subscribed via source and target branches