* 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 772f5bf68c017e5bdb3e018236b08cb192d9fb26..0dcb830da20d7e0c4cbc18d7e9602f5b4bddae6c 100644 (file)
--- 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 53b379283e090a7ab47ed852c9785ef73783ee67..e3432e16c7d61e0d8f2395e820232080b1527142 100644 (file)
--- 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 ce7f314b57acc2291313274763cc203dd6619df3..a4110421012f2b1997b922530ff44bcd2669b261 100644 (file)
--- 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 c15f37d904bda851db7b75681fdf1c55242f0e6e..068a1997fbae12d301c5cf3a24ad5c51d1cf31d4 100755 (executable)
--- 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= $';