From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 5 Sep 2019 08:39:51 +0000 (+0100)
Subject: dgit: Use $tarball_f_ext_re for test_source_only_changes
X-Git-Tag: archive/debian/9.8~17
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ce698d485ec4dc0315bef08a69061728564e7c7c;hp=0e6b4849c4a26631f70c6537d016c5da10e1ec1c;p=dgit.git

dgit: Use $tarball_f_ext_re for test_source_only_changes

The old ad-hoc regexp doesn't match .tar.gz.{asc,sig}.

Closes: #939280
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 941a14b9..fde8d615 100755
--- a/dgit
+++ b/dgit
@@ -2015,7 +2015,7 @@ sub test_source_only_changes ($) {
     foreach my $l (split /\n/, getfield $changes, 'Files') {
         $l =~ m/\S+$/ or next;
         # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
-        unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
+        unless ($& =~ m/(?:\.dsc|\.diff\.gz|$tarball_f_ext_re|_source\.buildinfo)$/) {
             print f_ "purportedly source-only changes polluted by %s\n", $&;
             return 0;
         }