diff options
Diffstat (limited to 'debian/patches/platform-lsbrelease.diff')
| -rw-r--r-- | debian/patches/platform-lsbrelease.diff | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/debian/patches/platform-lsbrelease.diff b/debian/patches/platform-lsbrelease.diff index 271139f..83f3df3 100644 --- a/debian/patches/platform-lsbrelease.diff +++ b/debian/patches/platform-lsbrelease.diff @@ -1,10 +1,8 @@ # DP: Use /etc/lsb-release to identify the platform. -Index: b/Lib/platform.py -=================================================================== --- a/Lib/platform.py +++ b/Lib/platform.py -@@ -267,7 +267,7 @@ _release_version = re.compile(r'([^0-9]+ +@@ -299,7 +299,7 @@ _release_version = re.compile(r'([^0-9]+ _supported_dists = ( 'SuSE', 'debian', 'fedora', 'redhat', 'centos', 'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo', @@ -13,18 +11,18 @@ Index: b/Lib/platform.py def _parse_release_file(firstline): -@@ -296,6 +296,10 @@ def _parse_release_file(firstline): +@@ -328,6 +328,10 @@ def _parse_release_file(firstline): id = l[1] return '', version, id -+_distributor_id_file_re = re.compile("(?:DISTRIB_ID\s*=)\s*(.*)", re.I) -+_release_file_re = re.compile("(?:DISTRIB_RELEASE\s*=)\s*(.*)", re.I) -+_codename_file_re = re.compile("(?:DISTRIB_CODENAME\s*=)\s*(.*)", re.I) ++_distributor_id_file_re = re.compile(r"(?:DISTRIB_ID\s*=)\s*(.*)", re.I) ++_release_file_re = re.compile(r"(?:DISTRIB_RELEASE\s*=)\s*(.*)", re.I) ++_codename_file_re = re.compile(r"(?:DISTRIB_CODENAME\s*=)\s*(.*)", re.I) + def linux_distribution(distname='', version='', id='', supported_dists=_supported_dists, -@@ -328,6 +332,25 @@ def _linux_distribution(distname, versio +@@ -360,6 +364,25 @@ def _linux_distribution(distname, versio args given as parameters. """ @@ -50,16 +48,3 @@ Index: b/Lib/platform.py try: etc = os.listdir(_UNIXCONFDIR) except OSError: -Index: b/Lib/test/test_platform.py -=================================================================== ---- a/Lib/test/test_platform.py -+++ b/Lib/test/test_platform.py -@@ -349,6 +349,8 @@ class PlatformTest(unittest.TestCase): - self.assertEqual(version, '19') - self.assertEqual(distid, 'Schr\xf6dinger\u2019s Cat') - -+ # we know we are Debian/Ubuntu -+ test_linux_distribution_encoding.skip = True - - class DeprecationTest(unittest.TestCase): - |