Kaynağa Gözat

* 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

Frank Lichtenheld 20 yıl önce
ebeveyn
işleme
51e2029b79
4 değiştirilmiş dosya ile 16 ekleme ve 0 silme
  1. 6 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 5 0
      man/C/dpkg-source.1
  4. 2 0
      scripts/dpkg-source.pl

+ 6 - 0
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

+ 3 - 0
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
 

+ 5 - 0
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.

+ 2 - 0
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= $';