From: Frank Lichtenheld <djpig@debian.org>
Date: Sun, 29 Jan 2006 18:05:38 +0000 (+0000)
Subject: * man/C/dpkg-source.1: Document that the -sX switches for
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51e2029b79900178bd0e33bb0b026608c657d0ae;p=dpkg

* man/C/dpkg-source.1: Document that the -sX switches for
dpkg-source are mutually exclusive and only one can be in
effect.
* scripts/dpkg-source.pl: Warn if more than one -sX switch
is specified on the command line.
Closes: #246637
---

diff --git a/ChangeLog b/ChangeLog
index 772f5bf6..0dcb830d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@
 	* scripts/dpkg-scanpackages.pl: Fix some bugs introduced by
 	the rewrite.
 
+	* man/C/dpkg-source.1: Document that the -sX switches for
+	dpkg-source are mutually exclusive and only one can be in
+	effect.
+	* scripts/dpkg-source.pl: Warn if more than one -sX switch
+	is specified on the command line.
+
 2006-01-29  Don Armstrong  <don@debian.org>
 
 	* scripts/dpkg-scanpackages.pl: Rewrite the script to support
diff --git a/debian/changelog b/debian/changelog
index 53b37928..e3432e16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ dpkg (1.13.14~) UNRELEASED; urgency=low
   * dpkg-scanpackages outputs help when given the --help or -h option
     (Don Armstrong). Closes: #319541
   * Document dpkg-scanpackage -m in man page.
+  * Let warn dpkg-source if more than one -sX option was given and
+    document the behaviour in this case in the man page.
+    Closes: #246637
 
  -- Guillem Jover <guillem@debian.org>  Sun, 29 Jan 2006 06:02:58 +0200
 
diff --git a/man/C/dpkg-source.1 b/man/C/dpkg-source.1
index ce7f314b..a4110421 100644
--- a/man/C/dpkg-source.1
+++ b/man/C/dpkg-source.1
@@ -419,6 +419,11 @@ unpacks the original source tree.
 ensures that the original source is neither copied to the current
 directory nor unpacked.  Any original source tree that was in the
 current directory is still removed.
+.PP
+All the
+.B \-sX
+options are mutually exclusive. If you specify more than one only the
+last one will be used.
 .SH dpkg\-GENCONTROL OPTIONS
 .B dpkg\-gencontrol
 does not take any non-option arguments.
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index c15f37d9..068a1997 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -109,6 +109,8 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
     } elsif (m/^-x$/) {
         &setopmode('extract');
     } elsif (m/^-s([akpursnAKPUR])$/) {
+	&warn( "-s$1 option overrides earlier -s$sourcestyle option" )
+	    if $sourcestyle ne 'X';
         $sourcestyle= $1;
     } elsif (m/^-c/) {
         $controlfile= $';