Merge lp://staging/~bdrung/apport/lp-1684600-gnu-linux into lp://staging/~apport-hackers/apport/trunk
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~bdrung/apport/lp-1684600-gnu-linux |
| Merge into: | lp://staging/~apport-hackers/apport/trunk |
| Diff against target: |
48 lines (+9/-11) 2 files modified
apport/packaging.py (+7/-11) bin/apport-retrace (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~bdrung/apport/lp-1684600-gnu-linux |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Apport upstream developers | Pending | ||
|
Review via email:
|
|||
Description of the change
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.
Unmerged revisions
- 3283. By Benjamin Drung
-
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
-
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
