apport-hackers team mailing list archive

[Dimitri John Ledkov <launchpad@xxxxxxxxxxxx>]

Dimitri John Ledkov has proposed merging lp:~xnox/apport/fix-cgroup into lp:apport.

Requested reviews:
  Apport upstream developers (apport-hackers)
Related bugs:
  Bug #1296026 in Apport: "apport crashes at reading cgroup"
  https://bugs.launchpad.net/apport/+bug/1296026

For more details, see:
https://code.launchpad.net/~xnox/apport/fix-cgroup/+merge/212282
-- 
https://code.launchpad.net/~xnox/apport/fix-cgroup/+merge/212282
Your team Apport upstream developers is requested to review the proposed merge of lp:~xnox/apport/fix-cgroup into lp:apport.

=== modified file 'apport/report.py'
--- apport/report.py	2014-01-20 14:41:03 +0000
+++ apport/report.py	2014-03-22 11:35:22 +0000
@@ -1589,9 +1589,9 @@
                 for l in f:
                     if 'name=systemd:' in l:
                         my_cgroup = l.split('systemd:', 1)[1].strip()
+                        if len(my_cgroup) < 2:
+                            return None
                         break
-                    if len(my_cgroup) < 2:
-                        return None
                 else:
                     return None
             # determine cgroup creation time