diff options
| author | Helge Deller <deller@gmx.de> | 2016-06-29 18:12:43 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2016-06-29 18:12:43 +0200 |
| commit | 6b251e401b7ccc22a53ce14abe7687606ac03c8e (patch) | |
| tree | 38cfaa66a64c40b02fe9bb530de9f2c2c1ef6488 /lsb_release.py | |
| parent | 6d457e5a33eade52ecd952469e415c9c4ca81e9c (diff) | |
Update lsb_release.py to cope with the new Debian Ports' release label
Closes: #827137
Changed-by: Didier Raboud <odyx@debian.org> to have tests for both the old and the new versions
Diffstat (limited to 'lsb_release.py')
| -rw-r--r-- | lsb_release.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lsb_release.py b/lsb_release.py index ce5c93d..0c4b078 100644 --- a/lsb_release.py +++ b/lsb_release.py @@ -184,7 +184,7 @@ def parse_apt_policy(): def guess_release_from_apt(origin='Debian', component='main', ignoresuites=('experimental'), label='Debian', - alternate_olabels={'Debian Ports':'ftp.debian-ports.org'}): + alternate_olabels={'Debian Ports': ('ftp.ports.debian.org', 'ftp.debian-ports.org')}): releases = parse_apt_policy() if not releases: @@ -197,7 +197,7 @@ def guess_release_from_apt(origin='Debian', component='main', x[1].get('component', '') == component and x[1].get('label', '') == label) or ( x[1].get('origin', '') in alternate_olabels and - x[1].get('label', '') == alternate_olabels.get(x[1].get('origin', '')))] + x[1].get('label', '') in alternate_olabels.get(x[1].get('origin', '')))] # Check again to make sure we didn't wipe out all of the releases if not releases: @@ -285,7 +285,7 @@ def guess_debian_release(): release = rinfo.get('version') # Special case Debian-Ports as their Release file has 'version': '1.0' - if release == '1.0' and rinfo.get('origin') == 'Debian Ports' and rinfo.get('label') == 'ftp.debian-ports.org': + if release == '1.0' and rinfo.get('origin') == 'Debian Ports' and rinfo.get('label') in ('ftp.ports.debian.org', 'ftp.debian-ports.org'): release = None rinfo.update({'suite': 'unstable'}) |