Просмотр исходного кода

Make deprecated dpkg-scanpackages --udeb option produce a warning

Callers should use -tudeb instead.
Guillem Jover лет назад: 17
Родитель
Сommit
bf8ae12d0e
3 измененных файлов с 10 добавлено и 4 удалено
  1. 1 1
      README.feature-removal-schedule
  2. 1 0
      debian/changelog
  3. 8 3
      scripts/dpkg-scanpackages.pl

+ 1 - 1
README.feature-removal-schedule

@@ -21,7 +21,7 @@ Why:
 What: -u, --udeb (dpkg-scanpackages option)
 Status: deprecated
 When: lenny+1
-Warning: none
+Warning: program
 Why:
  This option has been superseded by -tudeb.
 

+ 1 - 0
debian/changelog

@@ -127,6 +127,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low
   * Do not right justify the database reading progress percent counter.
   * Remove deprecated status on substvars for dpkg-source dpkg-genchanges,
     and stop producing warnings.
+  * Make deprecated dpkg-scanpackages --udeb option produce a warning.
 
   [ Frank Lichtenheld ]
   * Dpkg::Version: Remove unnecessary function next_elem which just

+ 8 - 3
scripts/dpkg-scanpackages.pl

@@ -38,7 +38,7 @@ use Getopt::Long qw(:config bundling);
 my %options = (help            => sub { usage(); exit 0; },
 	       version         => \&version,
 	       type            => undef,
-	       udeb            => 0,
+	       udeb            => \&set_type_udeb,
 	       arch            => undef,
 	       multiversion    => 0,
 	      );
@@ -66,6 +66,12 @@ Options:
 "), $progname;
 }
 
+sub set_type_udeb()
+{
+    warning(_g("-u, --udeb option is deprecated (see README.feature-removal-schedule)"));
+    $options{type} = 'udeb';
+}
+
 sub load_override
 {
     my $override = shift;
@@ -115,8 +121,7 @@ if (not @ARGV >= 1 && @ARGV <= 3) {
     usageerr(_g("1 to 3 args expected"));
 }
 
-my $type = defined($options{type}) ? $options{type} :
-				     $options{udeb} ? 'udeb' : 'deb';
+my $type = defined($options{type}) ? $options{type} : 'deb';
 my $arch = $options{arch};
 
 my @find_args;