[dak/master 2/2] Add .xz as a valid extension in various places.
Bug: http://bugs.debian.org/556407
Signed-off-by: Ansgar Burchardt <ansgar@debian.org>
---
daklib/regexes.py | 6 +++---
daklib/utils.py | 8 ++++----
tools/debianqueued-0.9/config | 2 +-
tools/debianqueued-0.9/config-backports | 2 +-
tools/debianqueued-0.9/config-security | 2 +-
tools/debianqueued-0.9/config-upload | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/daklib/regexes.py b/daklib/regexes.py
index 47e6ab2..d46aaad 100755
--- a/daklib/regexes.py
+++ b/daklib/regexes.py
@@ -49,11 +49,11 @@ re_arch_from_filename = re.compile(r"/binary-[^/]+/")
re_extract_src_version = re.compile (r"(\S+)\s*\((.*)\)")
re_isadeb = re.compile (r"(.+?)_(.+?)_(.+)\.u?deb$")
-orig_source_ext_re = r"orig(?:-.+)?\.tar\.(?:gz|bz2)"
+orig_source_ext_re = r"orig(?:-.+)?\.tar\.(?:gz|bz2|xz)"
re_orig_source_ext = re.compile(orig_source_ext_re + "$")
-re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2)|diff\.gz|tar\.(?:gz|bz2)|dsc)$")
+re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2|xz)|diff\.gz|tar\.(?:gz|bz2|xz)|dsc)$")
re_issource = re.compile(r"(.+)_(.+?)\." + re_source_ext.pattern)
-re_is_orig_source = re.compile (r"(.+)_(.+?)\.orig(?:-.+)?\.tar\.(?:gz|bz2)$")
+re_is_orig_source = re.compile (r"(.+)_(.+?)\.orig(?:-.+)?\.tar\.(?:gz|bz2|xz)$")
#re_is_orig_source = re.compile (r"(.+)_(.+?)\.(?:orig\.)?tar\.(?:gz|bz2)$")
re_single_line_field = re.compile(r"^(\S*?)\s*:\s*(.*)")
diff --git a/daklib/utils.py b/daklib/utils.py
index c1d78e3..fd4d7bb 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -395,10 +395,10 @@ def check_dsc_files(dsc_filename, dsc=None, dsc_files=None):
(r'orig.tar.gz', ('orig_tar_gz', 'orig_tar')),
(r'diff.gz', ('debian_diff',)),
(r'tar.gz', ('native_tar_gz', 'native_tar')),
- (r'debian\.tar\.(gz|bz2)', ('debian_tar',)),
- (r'orig\.tar\.(gz|bz2)', ('orig_tar',)),
- (r'tar\.(gz|bz2)', ('native_tar',)),
- (r'orig-.+\.tar\.(gz|bz2)', ('more_orig_tar',)),
+ (r'debian\.tar\.(gz|bz2|xz)', ('debian_tar',)),
+ (r'orig\.tar\.(gz|bz2|xz)', ('orig_tar',)),
+ (r'tar\.(gz|bz2|xz)', ('native_tar',)),
+ (r'orig-.+\.tar\.(gz|bz2|xz)', ('more_orig_tar',)),
)
for f in dsc_files.keys():
diff --git a/tools/debianqueued-0.9/config b/tools/debianqueued-0.9/config
index e4d3cae..c54e8ea 100644
--- a/tools/debianqueued-0.9/config
+++ b/tools/debianqueued-0.9/config
@@ -47,7 +47,7 @@ $max_delayed = 15;
$keep_files = '(status|\.message|README)$';
# file patterns that aren't deleted right away
-$valid_files = '(\.changes|\.tar\.(?:gz|bz2)|\.dsc|\.u?deb|diff\.gz|\.sh)$';
+$valid_files = '(\.changes|\.tar\.(?:gz|bz2|xz)|\.dsc|\.u?deb|diff\.gz|\.sh)$';
# Change files to mode 644 locally (after md5 check) or only on master?
$chmod_on_target = 0;
diff --git a/tools/debianqueued-0.9/config-backports b/tools/debianqueued-0.9/config-backports
index 1c9e0c9..07fd291 100644
--- a/tools/debianqueued-0.9/config-backports
+++ b/tools/debianqueued-0.9/config-backports
@@ -47,7 +47,7 @@ $max_delayed = -1;
$keep_files = '(status|\.message|README)$';
# file patterns that aren't deleted right away
-$valid_files = '(\.changes|\.tar\.(?:gz|bz2)|\.dsc|\.u?deb|diff\.gz|\.sh)$';
+$valid_files = '(\.changes|\.tar\.(?:gz|bz2|xz)|\.dsc|\.u?deb|diff\.gz|\.sh)$';
# Change files to mode 644 locally (after md5 check) or only on master?
$chmod_on_target = 0;
diff --git a/tools/debianqueued-0.9/config-security b/tools/debianqueued-0.9/config-security
index 1806a11..fd77e80 100644
--- a/tools/debianqueued-0.9/config-security
+++ b/tools/debianqueued-0.9/config-security
@@ -47,7 +47,7 @@ $max_delayed = -1;
$keep_files = '(status|\.message|README)$';
# file patterns that aren't deleted right away
-$valid_files = '(\.changes|\.tar\.(?:gz|bz2)|\.dsc|\.u?deb|diff\.gz|\.sh)$';
+$valid_files = '(\.changes|\.tar\.(?:gz|bz2|xz)|\.dsc|\.u?deb|diff\.gz|\.sh)$';
# Change files to mode 644 locally (after md5 check) or only on master?
$chmod_on_target = 0;
diff --git a/tools/debianqueued-0.9/config-upload b/tools/debianqueued-0.9/config-upload
index d607127..eee964a 100644
--- a/tools/debianqueued-0.9/config-upload
+++ b/tools/debianqueued-0.9/config-upload
@@ -47,7 +47,7 @@ $max_delayed = -1;
$keep_files = '(status|\.message|README)$';
# file patterns that aren't deleted right away
-$valid_files = '(\.changes|\.tar\.(?:gz|bz2)|\.dsc|\.u?deb|diff\.gz|\.sh)$';
+$valid_files = '(\.changes|\.tar\.(?:gz|bz2|xz)|\.dsc|\.u?deb|diff\.gz|\.sh)$';
# Change files to mode 644 locally (after md5 check) or only on master?
$chmod_on_target = 0;
--
1.7.2.5
Reply to: