diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-10-31 12:29:10 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-10-31 12:41:28 +0100 |
| commit | 5db9f15626904db81614140084f13df55ae004e4 (patch) | |
| tree | 20193fe28d3497eda9bd908eded10954ee6d5db2 | |
| parent | ca273d90631e630deecfab9ad8fe95627ce989c0 (diff) | |
dscfile: Make sure we match on additional tarballs containing uppercase
Closes: #880228
| -rw-r--r-- | gbp/deb/dscfile.py | 2 | ||||
| -rw-r--r-- | tests/12_test_deb.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gbp/deb/dscfile.py b/gbp/deb/dscfile.py index 2d065d29..5beea824 100644 --- a/gbp/deb/dscfile.py +++ b/gbp/deb/dscfile.py @@ -34,7 +34,7 @@ class DscFile(object): tar_re = re.compile(r'^\s\w+\s\d+\s+(?P<tar>[^_]+_[^_]+' '(\.orig)?\.tar\.%s)$' % compressions) add_tar_re = re.compile(r'^\s\w+\s\d+\s+(?P<tar>[^_]+_[^_]+' - '\.orig-(?P<dir>[a-z0-9-]+)\.tar\.%s)$' % compressions) + '\.orig-(?P<dir>[a-zA-Z0-9-]+)\.tar\.%s)$' % compressions) diff_re = re.compile(r'^\s\w+\s\d+\s+(?P<diff>[^_]+_[^_]+' '\.diff.(gz|bz2))$') deb_tgz_re = re.compile(r'^\s\w+\s\d+\s+(?P<deb_tgz>[^_]+_[^_]+' diff --git a/tests/12_test_deb.py b/tests/12_test_deb.py index af9a0853..669896a4 100644 --- a/tests/12_test_deb.py +++ b/tests/12_test_deb.py @@ -47,6 +47,7 @@ Checksums-Sha1: 7dc0f3bfe8a63a0259affe4fe3d3cc5b3180a72b 240 libvirt_0.9.12.orig-foo.tar.gz.asc 3743dc4f3e58d5912a98f568c3e854d97d81f123 20054618 libvirt_0.9.12.orig-bar.tar.gz 7dc0f3bfe8a63a0259affe4fe3d3cc5b3180a72b 240 libvirt_0.9.12.orig-bar.tar.gz.asc + 3743dc4f3e58d5912a98f568c3e854d97d81f12c 20054618 libvirt_0.9.12.orig-upper-CASE.tar.gz a7ffa64c18a5ee448c98b1dc894a0a27e1670357 35935 libvirt_0.9.12-4.debian.tar.gz Checksums-Sha256: 298ffc7f2a6d6e78aae46f11a0980f4bc17fa2928f5de6cd9e8abaf5990336e7 20054618 libvirt_0.9.12.orig.tar.gz @@ -55,6 +56,7 @@ Checksums-Sha256: 2496f435c029673dd7cad49cdf27935d261ef1b3b245118a431556b7f40a7967 240 libvirt_0.9.12.orig-foo.tar.gz.asc 298ffc7f2a6d6e78aae46f11a0980f4bc17fa2928f5de6cd9e8abaf599033123 20054618 libvirt_0.9.12.orig-bar.tar.gz 2496f435c029673dd7cad49cdf27935d261ef1b3b245118a431556b7f40a7967 240 libvirt_0.9.12.orig-bar.tar.gz.asc + 298ffc7f2a6d6e78aae46f11a0980f4bc17fa2928f5de6cd9e8abaf59903312c 20054618 libvirt_0.9.12.orig-upper-CASE.tar.gz e75110c493995ba5366e751f20f3842f30674c3918357fa6eb83175d0afbec31 35935 libvirt_0.9.12-4.debian.tar.gz Files: 5e842bc55733ceba60c64767580ff3e4 20054618 libvirt_0.9.12.orig.tar.gz @@ -63,6 +65,7 @@ Files: ddfefbf64ffa1b1d7e0819501d096544 240 libvirt_0.9.12.orig-foo.tar.gz.asc 5e842bc55733ceba60c64767580ff123 20054618 libvirt_0.9.12.orig-bar.tar.gz ddfefbf64ffa1b1d7e0819501d096544 240 libvirt_0.9.12.orig-bar.tar.gz.asc + 5e842bc55733ceba60c64767580ff12c 20054618 libvirt_0.9.12.orig-upper-CASE.tar.gz f328960d25e7c843f3ac5f9ba5064251 35935 libvirt_0.9.12-4.debian.tar.gz """ @@ -81,7 +84,7 @@ Files: self.assertEqual(os.path.basename(dsc.tgz), 'libvirt_0.9.12.orig.tar.gz') self.assertEqual(os.path.basename(dsc.diff), '') self.assertEqual(os.path.basename(dsc.deb_tgz), 'libvirt_0.9.12-4.debian.tar.gz') - for s in ['foo', 'bar']: + for s in ['foo', 'bar', 'upper-CASE']: self.assertEqual(os.path.basename(dsc.additional_tarballs[s]), 'libvirt_0.9.12.orig-%s.tar.gz' % s) self.assertEquals(sorted(dsc.sigs), ['/tmp/libvirt_0.9.12.orig-bar.tar.gz.asc', |