[releng] convert-to-tarballs.py: Support tar.xz
- From: Olav Vitters <ovitters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [releng] convert-to-tarballs.py: Support tar.xz
- Date: Sat, 19 Mar 2011 10:53:27 +0000 (UTC)
commit 7fd80b16147867c1376c22efecd7a48432377cf7
Author: Olav Vitters <olav vitters nl>
Date: Sat Mar 19 11:53:22 2011 +0100
convert-to-tarballs.py: Support tar.xz
tools/smoketesting/convert-to-tarballs.py | 30 +++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 6 deletions(-)
---
diff --git a/tools/smoketesting/convert-to-tarballs.py b/tools/smoketesting/convert-to-tarballs.py
index dcb2417..92da49c 100755
--- a/tools/smoketesting/convert-to-tarballs.py
+++ b/tools/smoketesting/convert-to-tarballs.py
@@ -631,13 +631,31 @@ class TarballLocator:
location, files = locator(u, max_version)
- tarballs = None
+ basenames = set()
+ tarballs = []
if location.find("ftp.debian.org") != -1:
- tarballs = [file for file in files if file.endswith('orig.tar.gz')]
- if not tarballs:
- tarballs = [file for file in files if file.endswith('.tar.bz2')]
- if not tarballs:
- tarballs = [file for file in files if file.endswith('.tar.gz')]
+ extensions = [
+ '.tar.xz',
+ '.tar.bz2',
+ '.tar.gz',
+ ]
+ else:
+ extensions = [
+ '.tar.xz',
+ 'orig.tar.bz2',
+ '.tar.bz2',
+ 'orig.tar.gz',
+ '.tar.gz',
+ ]
+
+
+ # Has to be checked by extension first; we prefer .tar.xz over .tar.bz2 and .tar.gz
+ for ext in extensions:
+ for file in files:
+ basename = file[:-len(ext)] # only valid when file ends with ext
+ if file.endswith(ext) and basename not in basenames:
+ basenames.add(basename)
+ tarballs.append(file)
# Only include tarballs for the given module
tarballs = [tarball for tarball in tarballs if modulename in tarball]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]