Merge lp:~jelmer/bzr-builddeb/tar-xz into lp:bzr-builddeb
- tar-xz
- Merge into trunk
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Merged at revision: | 613 |
Proposed branch: | lp:~jelmer/bzr-builddeb/tar-xz |
Merge into: | lp:bzr-builddeb |
Diff against target: |
284 lines (+45/-38) 9 files modified
cmds.py (+3/-3) debian/changelog (+6/-0) dh_make.py (+2/-2) import_dsc.py (+4/-4) tests/test_import_dsc.py (+2/-2) tests/test_upstream.py (+12/-12) tests/test_util.py (+5/-5) upstream/pristinetar.py (+7/-7) util.py (+4/-3) |
To merge this branch: | bzr merge lp:~jelmer/bzr-builddeb/tar-xz |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
Review via email: mp+74812@code.launchpad.net |
Commit message
Replace .tar.lzma with .tar.xz - our toolchain only supports the latter.
Description of the change
Replace .tar.lzma with .tar.xz - our toolchain only supports the latter.
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote : | # |
Revision history for this message
Vincent Ladeuil (vila) wrote : | # |
Fine !
This has caused http://
The package importer on jubany is currently at revno 607 (2 revisions after 2.7.7), do you think any change since then could cause problems there ? Or can I just deploy this patch once it has landed ?
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'cmds.py' | |||
2 | --- cmds.py 2011-08-11 15:55:14 +0000 | |||
3 | +++ cmds.py 2011-09-09 15:14:45 +0000 | |||
4 | @@ -471,7 +471,7 @@ | |||
5 | 471 | 471 | ||
6 | 472 | You must supply the source to import from, and in some cases | 472 | You must supply the source to import from, and in some cases |
7 | 473 | the version number of the new release. The source can be a .tar.gz, .tar, | 473 | the version number of the new release. The source can be a .tar.gz, .tar, |
9 | 474 | .tar.bz2, .tar.lzma, .tgz or .zip archive, a directory or a branch. The | 474 | .tar.bz2, .tar.xz, .tgz or .zip archive, a directory or a branch. The |
10 | 475 | source may also be a remote file described by a URL. | 475 | source may also be a remote file described by a URL. |
11 | 476 | 476 | ||
12 | 477 | In most situations the version can be guessed from the upstream source. | 477 | In most situations the version can be guessed from the upstream source. |
13 | @@ -577,8 +577,8 @@ | |||
14 | 577 | if v3: | 577 | if v3: |
15 | 578 | if location.endswith(".tar.bz2") or location.endswith(".tbz2"): | 578 | if location.endswith(".tar.bz2") or location.endswith(".tbz2"): |
16 | 579 | format = "bz2" | 579 | format = "bz2" |
19 | 580 | elif location.endswith(".tar.lzma"): | 580 | elif location.endswith(".tar.xz"): |
20 | 581 | format = "lzma" | 581 | format = "xz" |
21 | 582 | dest_name = tarball_name(package, version, None, format=format) | 582 | dest_name = tarball_name(package, version, None, format=format) |
22 | 583 | tarball_filename = os.path.join(orig_dir, dest_name) | 583 | tarball_filename = os.path.join(orig_dir, dest_name) |
23 | 584 | try: | 584 | try: |
24 | 585 | 585 | ||
25 | === modified file 'debian/changelog' | |||
26 | --- debian/changelog 2011-09-07 21:50:32 +0000 | |||
27 | +++ debian/changelog 2011-09-09 15:14:45 +0000 | |||
28 | @@ -1,3 +1,9 @@ | |||
29 | 1 | bzr-builddeb (2.7.9) UNRELEASED; urgency=low | ||
30 | 2 | |||
31 | 3 | * Support .tar.xz Debian files rather than .tar.lzma. | ||
32 | 4 | |||
33 | 5 | -- Jelmer Vernooij <jelmer@debian.org> Fri, 09 Sep 2011 15:21:22 +0200 | ||
34 | 6 | |||
35 | 1 | bzr-builddeb (2.7.8) unstable; urgency=low | 7 | bzr-builddeb (2.7.8) unstable; urgency=low |
36 | 2 | 8 | ||
37 | 3 | * Improve error message when tag for upstream version can not be | 9 | * Improve error message when tag for upstream version can not be |
38 | 4 | 10 | ||
39 | === modified file 'dh_make.py' | |||
40 | --- dh_make.py 2011-07-16 21:52:11 +0000 | |||
41 | +++ dh_make.py 2011-09-09 15:14:45 +0000 | |||
42 | @@ -62,8 +62,8 @@ | |||
43 | 62 | if use_v3: | 62 | if use_v3: |
44 | 63 | if tarball.endswith(".tar.bz2") or tarball.endswith(".tbz2"): | 63 | if tarball.endswith(".tar.bz2") or tarball.endswith(".tbz2"): |
45 | 64 | format = "bz2" | 64 | format = "bz2" |
48 | 65 | elif tarball.endswith(".tar.lzma"): | 65 | elif tarball.endswith(".tar.xz"): |
49 | 66 | format = "lzma" | 66 | format = "xz" |
50 | 67 | dest_name = util.tarball_name(package_name, version, None, format=format) | 67 | dest_name = util.tarball_name(package_name, version, None, format=format) |
51 | 68 | trace.note("Fetching tarball") | 68 | trace.note("Fetching tarball") |
52 | 69 | repack_tarball(tarball, dest_name, target_dir=orig_dir) | 69 | repack_tarball(tarball, dest_name, target_dir=orig_dir) |
53 | 70 | 70 | ||
54 | === modified file 'import_dsc.py' | |||
55 | --- import_dsc.py 2011-07-20 14:09:01 +0000 | |||
56 | +++ import_dsc.py 2011-09-09 15:14:45 +0000 | |||
57 | @@ -1477,7 +1477,7 @@ | |||
58 | 1477 | for part in self.dsc['files']: | 1477 | for part in self.dsc['files']: |
59 | 1478 | if (part['name'].endswith(".tar.gz") | 1478 | if (part['name'].endswith(".tar.gz") |
60 | 1479 | or part['name'].endswith(".tar.bz2") | 1479 | or part['name'].endswith(".tar.bz2") |
62 | 1480 | or part['name'].endswith(".tar.lzma")): | 1480 | or part['name'].endswith(".tar.xz")): |
63 | 1481 | self.unextracted_debian_md5 = part['md5sum'] | 1481 | self.unextracted_debian_md5 = part['md5sum'] |
64 | 1482 | 1482 | ||
65 | 1483 | 1483 | ||
66 | @@ -1521,12 +1521,12 @@ | |||
67 | 1521 | part['md5sum'])) | 1521 | part['md5sum'])) |
68 | 1522 | elif (part['name'].endswith(".debian.tar.gz") | 1522 | elif (part['name'].endswith(".debian.tar.gz") |
69 | 1523 | or part['name'].endswith(".debian.tar.bz2") | 1523 | or part['name'].endswith(".debian.tar.bz2") |
71 | 1524 | or part['name'].endswith(".debian.tar.lzma")): | 1524 | or part['name'].endswith(".debian.tar.xz")): |
72 | 1525 | self.unextracted_debian_md5 = part['md5sum'] | 1525 | self.unextracted_debian_md5 = part['md5sum'] |
73 | 1526 | assert self.upstream_tarballs is not None, \ | 1526 | assert self.upstream_tarballs is not None, \ |
75 | 1527 | "Can't handle non gz|bz2|lzma tarballs yet" | 1527 | "Can't handle non gz|bz2|xz tarballs yet" |
76 | 1528 | assert self.unextracted_debian_md5 is not None, \ | 1528 | assert self.unextracted_debian_md5 is not None, \ |
78 | 1529 | "Can't handle non gz|bz2|lzma tarballs yet" | 1529 | "Can't handle non gz|bz2|xz tarballs yet" |
79 | 1530 | 1530 | ||
80 | 1531 | 1531 | ||
81 | 1532 | SOURCE_EXTRACTORS = {} | 1532 | SOURCE_EXTRACTORS = {} |
82 | 1533 | 1533 | ||
83 | === modified file 'tests/test_import_dsc.py' | |||
84 | --- tests/test_import_dsc.py 2011-08-31 01:16:19 +0000 | |||
85 | +++ tests/test_import_dsc.py 2011-09-09 15:14:45 +0000 | |||
86 | @@ -925,7 +925,7 @@ | |||
87 | 925 | "esse cillum dolore eu fugiat nulla pariatur. Excepteur sint " | 925 | "esse cillum dolore eu fugiat nulla pariatur. Excepteur sint " |
88 | 926 | "occaecat cupidatat non proident, sunt in culpa qui officia " | 926 | "occaecat cupidatat non proident, sunt in culpa qui officia " |
89 | 927 | "deserunt mollit anim id est laborum.") | 927 | "deserunt mollit anim id est laborum.") |
91 | 928 | tar_path = "package_0.1.orig.tar.lzma" | 928 | tar_path = "package_0.1.orig.tar.xz" |
92 | 929 | f = lzma.LZMAFile(tar_path, 'w') | 929 | f = lzma.LZMAFile(tar_path, 'w') |
93 | 930 | try: | 930 | try: |
94 | 931 | tf = tarfile.open(None, 'w', f) | 931 | tf = tarfile.open(None, 'w', f) |
95 | @@ -947,7 +947,7 @@ | |||
96 | 947 | self.assertEqual(rev.message, | 947 | self.assertEqual(rev.message, |
97 | 948 | "Import upstream version %s" % str(version.upstream_version)) | 948 | "Import upstream version %s" % str(version.upstream_version)) |
98 | 949 | self.assertEqual(rev.properties['deb-md5'], self.fake_md5_1) | 949 | self.assertEqual(rev.properties['deb-md5'], self.fake_md5_1) |
100 | 950 | self.assertTrue('deb-pristine-delta-lzma' in rev.properties) | 950 | self.assertTrue('deb-pristine-delta-xz' in rev.properties) |
101 | 951 | 951 | ||
102 | 952 | def test_import_package_init_from_other(self): | 952 | def test_import_package_init_from_other(self): |
103 | 953 | self.requireFeature(PristineTarFeature) | 953 | self.requireFeature(PristineTarFeature) |
104 | 954 | 954 | ||
105 | === modified file 'tests/test_upstream.py' | |||
106 | --- tests/test_upstream.py 2011-09-07 20:11:50 +0000 | |||
107 | +++ tests/test_upstream.py 2011-09-09 15:14:45 +0000 | |||
108 | @@ -224,17 +224,17 @@ | |||
109 | 224 | _apt_pkg=apt_pkg) | 224 | _apt_pkg=apt_pkg) |
110 | 225 | self.assertEquals(paths, ["target/apackage_0.2.orig.tar.bz2"]) | 225 | self.assertEquals(paths, ["target/apackage_0.2.orig.tar.bz2"]) |
111 | 226 | 226 | ||
113 | 227 | def test_apt_provider_right_version_lzma(self): | 227 | def test_apt_provider_right_version_xz(self): |
114 | 228 | caller = MockAptCaller(work=True) | 228 | caller = MockAptCaller(work=True) |
115 | 229 | sources = MockSources(["0.1-1", "0.2-1"], | 229 | sources = MockSources(["0.1-1", "0.2-1"], |
116 | 230 | [[("checksum", 0L, "apackage_0.1.orig.tar.gz", "tar")], | 230 | [[("checksum", 0L, "apackage_0.1.orig.tar.gz", "tar")], |
118 | 231 | [("checksum", 0L, "apackage_0.2.orig.tar.lzma", "tar")]]) | 231 | [("checksum", 0L, "apackage_0.2.orig.tar.xz", "tar")]]) |
119 | 232 | apt_pkg = MockAptPkg(sources) | 232 | apt_pkg = MockAptPkg(sources) |
120 | 233 | src = AptSource() | 233 | src = AptSource() |
121 | 234 | src._run_apt_source = caller.call | 234 | src._run_apt_source = caller.call |
122 | 235 | paths = src.fetch_tarballs("apackage", "0.2", "target", | 235 | paths = src.fetch_tarballs("apackage", "0.2", "target", |
123 | 236 | _apt_pkg=apt_pkg) | 236 | _apt_pkg=apt_pkg) |
125 | 237 | self.assertEquals(paths, ["target/apackage_0.2.orig.tar.lzma"]) | 237 | self.assertEquals(paths, ["target/apackage_0.2.orig.tar.xz"]) |
126 | 238 | 238 | ||
127 | 239 | def test_apt_provider_right_version(self): | 239 | def test_apt_provider_right_version(self): |
128 | 240 | caller = MockAptCaller(work=True) | 240 | caller = MockAptCaller(work=True) |
129 | @@ -746,10 +746,10 @@ | |||
130 | 746 | rev.properties["deb-pristine-delta-bz2"] = "1" | 746 | rev.properties["deb-pristine-delta-bz2"] = "1" |
131 | 747 | self.assertEquals("bz2", self.source.pristine_tar_format(rev)) | 747 | self.assertEquals("bz2", self.source.pristine_tar_format(rev)) |
132 | 748 | 748 | ||
134 | 749 | def test_pristine_tar_format_lzma(self): | 749 | def test_pristine_tar_format_xz(self): |
135 | 750 | rev = Revision("myrevid") | 750 | rev = Revision("myrevid") |
138 | 751 | rev.properties["deb-pristine-delta-lzma"] = "1" | 751 | rev.properties["deb-pristine-delta-xz"] = "1" |
139 | 752 | self.assertEquals("lzma", self.source.pristine_tar_format(rev)) | 752 | self.assertEquals("xz", self.source.pristine_tar_format(rev)) |
140 | 753 | 753 | ||
141 | 754 | def test_pristine_tar_format_unknown(self): | 754 | def test_pristine_tar_format_unknown(self): |
142 | 755 | rev = Revision("myrevid") | 755 | rev = Revision("myrevid") |
143 | @@ -836,21 +836,21 @@ | |||
144 | 836 | self.assertPathExists("bar/foo_1.0.orig.tar.bz2") | 836 | self.assertPathExists("bar/foo_1.0.orig.tar.bz2") |
145 | 837 | tarfile.open("bar/foo_1.0.orig.tar.bz2", "r:bz2").close() | 837 | tarfile.open("bar/foo_1.0.orig.tar.bz2", "r:bz2").close() |
146 | 838 | 838 | ||
148 | 839 | def test_fetch_tarball_lzma(self): | 839 | def test_fetch_tarball_xz(self): |
149 | 840 | self.requireFeature(LzmaFeature) | 840 | self.requireFeature(LzmaFeature) |
150 | 841 | import lzma | 841 | import lzma |
152 | 842 | lzma_f = lzma.LZMAFile("foo-1.0.tar.lzma", 'w') | 842 | lzma_f = lzma.LZMAFile("foo-1.0.tar.xz", 'w') |
153 | 843 | try: | 843 | try: |
154 | 844 | tar = tarfile.open("foo-1.0.tar", "w", lzma_f) | 844 | tar = tarfile.open("foo-1.0.tar", "w", lzma_f) |
155 | 845 | tar.close() | 845 | tar.close() |
156 | 846 | finally: | 846 | finally: |
157 | 847 | lzma_f.close() | 847 | lzma_f.close() |
159 | 848 | source = TarfileSource("foo-1.0.tar.lzma", "1.0") | 848 | source = TarfileSource("foo-1.0.tar.xz", "1.0") |
160 | 849 | os.mkdir("bar") | 849 | os.mkdir("bar") |
162 | 850 | self.assertEquals(["bar/foo_1.0.orig.tar.gz"], | 850 | self.assertEquals(["bar/foo_1.0.orig.tar.xz"], |
163 | 851 | source.fetch_tarballs("foo", "1.0", "bar")) | 851 | source.fetch_tarballs("foo", "1.0", "bar")) |
166 | 852 | self.assertPathExists("bar/foo_1.0.orig.tar.gz") | 852 | self.assertPathExists("bar/foo_1.0.orig.tar.xz") |
167 | 853 | gzip.open("bar/foo_1.0.orig.tar.gz").close() | 853 | lzma.LZMAFile("bar/foo_1.0.orig.tar.xz").close() |
168 | 854 | 854 | ||
169 | 855 | 855 | ||
170 | 856 | class _MissingUpstreamProvider(UpstreamProvider): | 856 | class _MissingUpstreamProvider(UpstreamProvider): |
171 | 857 | 857 | ||
172 | === modified file 'tests/test_util.py' | |||
173 | --- tests/test_util.py 2011-08-31 01:16:19 +0000 | |||
174 | +++ tests/test_util.py 2011-09-09 15:14:45 +0000 | |||
175 | @@ -284,9 +284,9 @@ | |||
176 | 284 | self.assertEqual(tarball_name("package", Version("0.1"), None, | 284 | self.assertEqual(tarball_name("package", Version("0.1"), None, |
177 | 285 | format='bz2'), "package_0.1.orig.tar.bz2") | 285 | format='bz2'), "package_0.1.orig.tar.bz2") |
178 | 286 | self.assertEqual(tarball_name("package", Version("0.1"), None, | 286 | self.assertEqual(tarball_name("package", Version("0.1"), None, |
180 | 287 | format='lzma'), "package_0.1.orig.tar.lzma") | 287 | format='xz'), "package_0.1.orig.tar.xz") |
181 | 288 | self.assertEqual(tarball_name("package", Version("0.1"), "la", | 288 | self.assertEqual(tarball_name("package", Version("0.1"), "la", |
183 | 289 | format='lzma'), "package_0.1.orig-la.tar.lzma") | 289 | format='xz'), "package_0.1.orig-la.tar.xz") |
184 | 290 | 290 | ||
185 | 291 | 291 | ||
186 | 292 | class SuiteToDistributionTests(TestCase): | 292 | class SuiteToDistributionTests(TestCase): |
187 | @@ -883,7 +883,7 @@ | |||
188 | 883 | f = gzip.GzipFile(tar_path, "w") | 883 | f = gzip.GzipFile(tar_path, "w") |
189 | 884 | elif compression == "bz2": | 884 | elif compression == "bz2": |
190 | 885 | f = bz2.BZ2File(tar_path, "w") | 885 | f = bz2.BZ2File(tar_path, "w") |
192 | 886 | elif compression == "lzma": | 886 | elif compression == "xz": |
193 | 887 | import lzma | 887 | import lzma |
194 | 888 | f = lzma.LZMAFile(tar_path, "w") | 888 | f = lzma.LZMAFile(tar_path, "w") |
195 | 889 | else: | 889 | else: |
196 | @@ -915,9 +915,9 @@ | |||
197 | 915 | strip_components=1) | 915 | strip_components=1) |
198 | 916 | self.assertEquals(os.listdir("target"), ["README"]) | 916 | self.assertEquals(os.listdir("target"), ["README"]) |
199 | 917 | 917 | ||
201 | 918 | def test_single_orig_tar_lzma(self): | 918 | def test_single_orig_tar_xz(self): |
202 | 919 | self.requireFeature(LzmaFeature) | 919 | self.requireFeature(LzmaFeature) |
204 | 920 | tar_path = self.create_tarball("package", "0.1", "lzma") | 920 | tar_path = self.create_tarball("package", "0.1", "xz") |
205 | 921 | os.mkdir("target") | 921 | os.mkdir("target") |
206 | 922 | extract_orig_tarballs([(tar_path, None)], "target", | 922 | extract_orig_tarballs([(tar_path, None)], "target", |
207 | 923 | strip_components=1) | 923 | strip_components=1) |
208 | 924 | 924 | ||
209 | === modified file 'upstream/pristinetar.py' | |||
210 | --- upstream/pristinetar.py 2011-07-17 13:12:28 +0000 | |||
211 | +++ upstream/pristinetar.py 2011-09-09 15:14:45 +0000 | |||
212 | @@ -195,8 +195,8 @@ | |||
213 | 195 | uuencoded = standard_b64encode(delta) | 195 | uuencoded = standard_b64encode(delta) |
214 | 196 | if tarball.endswith(".tar.bz2"): | 196 | if tarball.endswith(".tar.bz2"): |
215 | 197 | revprops["deb-pristine-delta-bz2"] = uuencoded | 197 | revprops["deb-pristine-delta-bz2"] = uuencoded |
218 | 198 | elif tarball.endswith(".tar.lzma"): | 198 | elif tarball.endswith(".tar.xz"): |
219 | 199 | revprops["deb-pristine-delta-lzma"] = uuencoded | 199 | revprops["deb-pristine-delta-xz"] = uuencoded |
220 | 200 | else: | 200 | else: |
221 | 201 | revprops["deb-pristine-delta"] = uuencoded | 201 | revprops["deb-pristine-delta"] = uuencoded |
222 | 202 | if author is not None: | 202 | if author is not None: |
223 | @@ -316,15 +316,15 @@ | |||
224 | 316 | def has_pristine_tar_delta(self, rev): | 316 | def has_pristine_tar_delta(self, rev): |
225 | 317 | return ('deb-pristine-delta' in rev.properties | 317 | return ('deb-pristine-delta' in rev.properties |
226 | 318 | or 'deb-pristine-delta-bz2' in rev.properties | 318 | or 'deb-pristine-delta-bz2' in rev.properties |
228 | 319 | or 'deb-pristine-delta-lzma' in rev.properties) | 319 | or 'deb-pristine-delta-xz' in rev.properties) |
229 | 320 | 320 | ||
230 | 321 | def pristine_tar_format(self, rev): | 321 | def pristine_tar_format(self, rev): |
231 | 322 | if 'deb-pristine-delta' in rev.properties: | 322 | if 'deb-pristine-delta' in rev.properties: |
232 | 323 | return 'gz' | 323 | return 'gz' |
233 | 324 | elif 'deb-pristine-delta-bz2' in rev.properties: | 324 | elif 'deb-pristine-delta-bz2' in rev.properties: |
234 | 325 | return 'bz2' | 325 | return 'bz2' |
237 | 326 | elif 'deb-pristine-delta-lzma' in rev.properties: | 326 | elif 'deb-pristine-delta-xz' in rev.properties: |
238 | 327 | return 'lzma' | 327 | return 'xz' |
239 | 328 | assert self.has_pristine_tar_delta(rev) | 328 | assert self.has_pristine_tar_delta(rev) |
240 | 329 | raise AssertionError("Not handled new delta type in " | 329 | raise AssertionError("Not handled new delta type in " |
241 | 330 | "pristine_tar_format") | 330 | "pristine_tar_format") |
242 | @@ -334,8 +334,8 @@ | |||
243 | 334 | uuencoded = rev.properties['deb-pristine-delta'] | 334 | uuencoded = rev.properties['deb-pristine-delta'] |
244 | 335 | elif 'deb-pristine-delta-bz2' in rev.properties: | 335 | elif 'deb-pristine-delta-bz2' in rev.properties: |
245 | 336 | uuencoded = rev.properties['deb-pristine-delta-bz2'] | 336 | uuencoded = rev.properties['deb-pristine-delta-bz2'] |
248 | 337 | elif 'deb-pristine-delta-lzma' in rev.properties: | 337 | elif 'deb-pristine-delta-xz' in rev.properties: |
249 | 338 | uuencoded = rev.properties['deb-pristine-delta-lzma'] | 338 | uuencoded = rev.properties['deb-pristine-delta-xz'] |
250 | 339 | else: | 339 | else: |
251 | 340 | assert self.has_pristine_tar_delta(rev) | 340 | assert self.has_pristine_tar_delta(rev) |
252 | 341 | raise AssertionError("Not handled new delta type in " | 341 | raise AssertionError("Not handled new delta type in " |
253 | 342 | 342 | ||
254 | === modified file 'util.py' | |||
255 | --- util.py 2011-07-25 00:14:48 +0000 | |||
256 | +++ util.py 2011-09-09 15:14:45 +0000 | |||
257 | @@ -216,7 +216,7 @@ | |||
258 | 216 | :param version: the upstream version of the package. | 216 | :param version: the upstream version of the package. |
259 | 217 | :param component: Component name (None for base) | 217 | :param component: Component name (None for base) |
260 | 218 | :param format: the format for the tarball. If None then 'gz' will be | 218 | :param format: the format for the tarball. If None then 'gz' will be |
262 | 219 | used. You probably want on of 'gz', 'bz2', or 'lzma'. | 219 | used. You probably want on of 'gz', 'bz2', 'lzma' or 'xz'. |
263 | 220 | :return: a string that is the name of the upstream tarball to use. | 220 | :return: a string that is the name of the upstream tarball to use. |
264 | 221 | """ | 221 | """ |
265 | 222 | if format is None: | 222 | if format is None: |
266 | @@ -698,7 +698,7 @@ | |||
267 | 698 | "invalid orig tarball file %s does not have expected prefix %s" % ( | 698 | "invalid orig tarball file %s does not have expected prefix %s" % ( |
268 | 699 | tarball_filename, prefix)) | 699 | tarball_filename, prefix)) |
269 | 700 | base = tarball_filename[len(prefix):] | 700 | base = tarball_filename[len(prefix):] |
271 | 701 | for ext in (".tar.gz", ".tar.bz2", ".tar.lzma"): | 701 | for ext in (".tar.gz", ".tar.bz2", ".tar.lzma", ".tar.xz"): |
272 | 702 | if tarball_filename.endswith(ext): | 702 | if tarball_filename.endswith(ext): |
273 | 703 | base = base[:-len(ext)] | 703 | base = base[:-len(ext)] |
274 | 704 | break | 704 | break |
275 | @@ -726,7 +726,8 @@ | |||
276 | 726 | tar_args = ["tar"] | 726 | tar_args = ["tar"] |
277 | 727 | if tarball_filename.endswith(".tar.bz2"): | 727 | if tarball_filename.endswith(".tar.bz2"): |
278 | 728 | tar_args.append('xjf') | 728 | tar_args.append('xjf') |
280 | 729 | elif tarball_filename.endswith(".tar.lzma"): | 729 | elif (tarball_filename.endswith(".tar.lzma") or |
281 | 730 | tarball_filename.endswith(".tar.xz")): | ||
282 | 730 | tar_args.append('xJf') | 731 | tar_args.append('xJf') |
283 | 731 | else: | 732 | else: |
284 | 732 | tar_args.append('xzf') | 733 | tar_args.append('xzf') |
I think we should do another release and upload to oneiric after this lands.