Merge lp:~bdrung/apport/lp-1684600-gnu-linux into lp:~apport-hackers/apport/trunk

[Benjamin Drung]

Fix stripping GNU/Linux from DistroRelease

The DistroRelease contains GNU/Linux on Debian (example: "Debian
GNU/Linux 8"). The containing slash is very confusing when using the
DistroRelease as path.

name[1:-2] strips one leading characters and two trailing characters and
removes one character too much at the end. Thus the name.endswith check
fails to match 'GNU/Linux' and does nothing. If it was matching
GNU/Linux, it would set name to a list.

Fix the parsing of /etc/os-release by using shlex.

[lp:~bdrung/apport/lp-1684600-gnu-linux]

3283. By Benjamin Drung on 2020-09-21

Strip GNU/Linux from DistroRelease

The DistroRelease contains GNU/Linux on Debian (example: "Debian
GNU/Linux 8"). The containing slash is very confusing when using the
DistroRelease as path. Thus just strip GNU/Linux from the DistroRelease
before using it as part of a path.

LP: #1684600

Unmerged revisions

3283. By Benjamin Drung on 2020-09-21

Strip GNU/Linux from DistroRelease

The DistroRelease contains GNU/Linux on Debian (example: "Debian
GNU/Linux 8"). The containing slash is very confusing when using the
DistroRelease as path. Thus just strip GNU/Linux from the DistroRelease
before using it as part of a path.

LP: #1684600

3282. By Benjamin Drung on 2020-08-21

Fix stripping GNU/Linux from DistroRelease

The DistroRelease contains GNU/Linux on Debian (example: "Debian
GNU/Linux 8"). The containing slash is very confusing when using the
DistroRelease as path.

name[1:-2] strips one leading characters and two trailing characters and
removes one character too much at the end. Thus the name.endswith check
fails to match 'GNU/Linux' and does nothing. If it was matching
GNU/Linux, it would set name to a list.

Fix the parsing of /etc/os-release by using shlex.

LP: #1684600

=== modified file 'apport/packaging.py'
--- apport/packaging.py	2017-06-12 23:42:53 +0000
+++ apport/packaging.py	2020-09-21 14:14:56 +0000
@@ -12,6 +12,7 @@
 import os
 import sys
 import re
+import shlex
 import subprocess
 
 
@@ -284,17 +285,12 @@
             version = None
             with open('/etc/os-release') as f:
                 for l in f:
-                    if l.startswith('NAME='):
-                        name = l.split('=', 1)[1]
-                        if name.startswith('"'):
-                            name = name[1:-2].strip()
-                        # work around inconsistent "Debian GNU/Linux" in os-release
-                        if name.endswith('GNU/Linux'):
-                            name = name.split()[0:-1]
-                    elif l.startswith('VERSION_ID='):
-                        version = l.split('=', 1)[1]
-                        if version.startswith('"'):
-                            version = version[1:-2].strip()
+                    key, value = shlex.split(l)[0].split("=", 1)
+                    if key == "NAME":
+                        # The OS name might be used as path later. Thus avoid / in the name.
+                        name = value[:-9].strip() if value.endswith("GNU/Linux") else value
+                    if key == "VERSION_ID":
+                        version = value
             if name and version:
                 self._os_version = (name, version)
                 return self._os_version

=== modified file 'bin/apport-retrace'
--- bin/apport-retrace	2018-01-09 00:58:33 +0000
+++ bin/apport-retrace	2020-09-21 14:14:56 +0000
@@ -303,6 +303,8 @@
 
 apport.memdbg('sanity checks passed')
 
+report["DistroRelease"] = re.sub(" GNU/Linux", "", report["DistroRelease"])
+
 if options.gdb_sandbox:
     system_arch = apport.packaging.get_system_architecture()
     if system_arch != 'amd64':