From 9a1cfa782b2147f017debea6819d71707ff5ab7d Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Tue, 18 Aug 2015 21:47:18 +0200 Subject: [PATCH] Allow *.asc to be uploaded Source packages should be allowed to include an optional upstream signature in a *.asc file. --- daklib/regexes.py | 2 +- 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-security-disembargo | 2 +- tools/debianqueued-0.9/config-security-embargoed | 2 +- tools/debianqueued-0.9/config-upload | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/daklib/regexes.py b/daklib/regexes.py index adc5b24b..64b5b8dd 100644 --- a/daklib/regexes.py +++ b/daklib/regexes.py @@ -49,7 +49,7 @@ re_isadeb = re.compile (r"(.+?)_(.+?)_(.+)\.u?deb$") 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|xz)|diff\.gz|tar\.(?:gz|bz2|xz)|dsc)$") +re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2|xz)|diff\.gz|tar\.(?:gz|bz2|xz)|dsc|asc)$") re_issource = re.compile(r"(.+)_(.+?)\." + re_source_ext.pattern) re_single_line_field = re.compile(r"^(\S*?)\s*:\s*(.*)") diff --git a/tools/debianqueued-0.9/config b/tools/debianqueued-0.9/config index 3f65e411..fd889dbb 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|xz)|\.dsc|\.u?deb|diff\.gz|\.sh)$'; +$valid_files = '(\.changes|\.tar\.(?:gz|bz2|xz)|\.dsc|\.u?deb|diff\.gz|\.sh|\.asc)$'; # 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 cb4ec222..128f36d2 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|xz)|\.dsc|\.u?deb|diff\.gz|\.sh)$'; +$valid_files = '(\.changes|\.tar\.(?:gz|bz2|xz)|\.dsc|\.u?deb|diff\.gz|\.sh|\.asc)$'; # 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 7d15f4ff..16fa25c6 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|xz)|\.dsc|\.u?deb|diff\.gz|\.sh)$'; +$valid_files = '(\.changes|\.tar\.(?:gz|bz2|xz)|\.dsc|\.u?deb|diff\.gz|\.sh|\.asc)$'; # 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-disembargo b/tools/debianqueued-0.9/config-security-disembargo index 60e8d110..c6adb38f 100644 --- a/tools/debianqueued-0.9/config-security-disembargo +++ b/tools/debianqueued-0.9/config-security-disembargo @@ -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|xz)|\.dsc|\.u?deb|diff\.gz|\.sh)$'; +$valid_files = '(\.changes|\.tar\.(?:gz|bz2|xz)|\.dsc|\.u?deb|diff\.gz|\.sh|\.asc)$'; # 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-embargoed b/tools/debianqueued-0.9/config-security-embargoed index df074bd6..7d6fb0c4 100644 --- a/tools/debianqueued-0.9/config-security-embargoed +++ b/tools/debianqueued-0.9/config-security-embargoed @@ -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|xz)|\.dsc|\.u?deb|diff\.gz|\.sh)$'; +$valid_files = '(\.changes|\.tar\.(?:gz|bz2|xz)|\.dsc|\.u?deb|diff\.gz|\.sh|\.asc)$'; # 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 1f086a9c..312ca292 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|xz)|\.dsc|\.u?deb|diff\.gz|\.sh)(\.[A-Za-z0-9]{6})?$'; +$valid_files = '(\.changes|\.tar\.(?:gz|bz2|xz)|\.dsc|\.u?deb|diff\.gz|\.sh|\.asc)(\.[A-Za-z0-9]{6})?$'; # Change files to mode 644 locally (after md5 check) or only on master? $chmod_on_target = 0; -- 2.39.2