[Reproducible-commits] [dpkg] 91/105: scripts: Remove -s option argument parsing that does not match

[Niko Tyni]

This is an automated email from the git hooks/post-receive script.

ntyni pushed a commit to branch ntyni/reproducible_builds
in repository dpkg.

commit f02d1c55ced66f3885c88d2c2431983f1c525454
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Apr 24 00:13:53 2016 +0200

    scripts: Remove -s option argument parsing that does not match
    
    The -si and -sn arguments are handled in previous code branches.
---
 scripts/Dpkg/Source/Package/V1.pm | 4 ++--
 scripts/dpkg-buildpackage.pl      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm
index 8e5fa7f..8d1efa9 100644
--- a/scripts/Dpkg/Source/Package/V1.pm
+++ b/scripts/Dpkg/Source/Package/V1.pm
@@ -369,9 +369,9 @@ sub do_build {
     if ($sourcestyle eq 'n') {
         $self->{options}{ARGV} = []; # ensure we have no error
         Dpkg::Source::Package::V3::Native::do_build($self, $dir);
-    } elsif ($sourcestyle =~ m/[nurUR]/) {
+    } elsif ($sourcestyle =~ m/[urUR]/) {
         if (stat($tarname)) {
-            unless ($sourcestyle =~ m/[nUR]/) {
+            unless ($sourcestyle =~ m/[UR]/) {
 		error(g_("tarfile '%s' already exists, not overwriting, " .
 		         'giving up; use -sU or -sR to override'), $tarname);
             }
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 475da41..2103980 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -244,7 +244,7 @@ while (@ARGV) {
 	@build_profiles = split /,/, $arg;
     } elsif (/^-s[iad]$/) {
 	push @changes_opts, $_;
-    } elsif (/^-(?:s[insAkurKUR]|[zZ].*|i.*|I.*)$/) {
+    } elsif (/^-(?:s[nsAkurKUR]|[zZ].*|i.*|I.*)$/) {
 	push @source_opts, $_; # passed to dpkg-source
     } elsif (/^-tc$/) {
 	$cleansource = 1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git