From 4c41b1dfd363069066b364d1d6bf5f4003c696d6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 6 Mar 2007 08:06:44 +0000
Subject: [PATCH] Make the override-file argument to dpkg-scanpackages options.

---
 ChangeLog                    |   7 +++
 debian/changelog             |   1 +
 man/ChangeLog                |   4 ++
 man/dpkg-scanpackages.1      |   4 +-
 scripts/dpkg-scanpackages.pl | 112 +++++++++++++++++++++--------------
 5 files changed, 83 insertions(+), 45 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f4d9f7d5..6877dbe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-06  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-scanpackages.pl (usage): Documemt that the override
+	file is now optional.
+	(load_override): New function, refactored. Handle the case where
+	'$override' is undefined.
+
 2007-02-28  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-checkbuilddeps.pl: Make getopt parse '--admindir'.
diff --git a/debian/changelog b/debian/changelog
index 8e078ffd..553d65af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ dpkg (1.14.0) UNRELEASED; urgency=low
   * Add support for '--admindir' in dpkg-buildpackage, dpkg-checkbuilddeps
     and dpkg-shlibdeps. Closes: #162348
   * Cleaning and format unification of manual pages.
+  * Make the override-file argument to dpkg-scanpackages options.
 
   [ Updated dpkg translations ]
   * Romanian (Eddy Petrișor).
diff --git a/man/ChangeLog b/man/ChangeLog
index eccf09b4..267eb937 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-06  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-scanpackages.1: Mark the override argument as optional.
+
 2007-03-06  Guillem Jover  <guillem@debian.org>
 
 	* update-alternatives.8: Reorder EXAMPLES section.
diff --git a/man/dpkg-scanpackages.1 b/man/dpkg-scanpackages.1
index a4aa5f9e..3a769b02 100644
--- a/man/dpkg-scanpackages.1
+++ b/man/dpkg-scanpackages.1
@@ -21,8 +21,8 @@ dpkg\-scanpackages - create Packages files
 .B dpkg\-scanpackages
 .RI [ options ]
 .I binary-dir
-.I override-file
-.RI [ path-prefix ]
+.RI [ override-file
+.RI [ path-prefix ]]
 .B >
 .I Packages
 .
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index f459a8b6..3dbb12b8 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -15,6 +15,10 @@ push(@INC,$dpkglibdir);
 require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
+my (@samemaint, @changedmaint);
+my %packages;
+my %overridden;
+
 my %kmap= (optional         => 'suggests',
 	   recommended      => 'recommends',
 	   class            => 'priority',
@@ -68,7 +72,7 @@ sub version {
 
 sub usage {
     printf _g(
-"Usage: %s [<option> ...] <binarypath> <overridefile> [<pathprefix>] > Packages
+"Usage: %s [<option> ...] <binarypath> [<overridefile> [<pathprefix>]] > Packages
 
 Options:
   -u, --udeb               scan for udebs.
@@ -79,7 +83,64 @@ Options:
 "), $0;
 }
 
-&usage and exit 1 if not $result and (@ARGV < 2);
+sub load_override
+{
+    my $override = shift;
+
+    if (defined $override) {
+	-e $override or
+	    die sprintf(_g("Override file %s not found"), $override)."\n";
+    } else {
+	return;
+    }
+
+    my $override_fh = new IO::File $override, 'r' or
+	die sprintf(_g("Couldn't open override file %s: %s"), $override, $!)."\n";
+
+    while (<$override_fh>) {
+	s/\#.*//;
+	s/\s+$//;
+	next unless $_;
+
+	my ($p, $priority, $section, $maintainer) = split(/\s+/, $_, 4);
+
+	next unless defined($packages{$p});
+
+	for my $package (@{$packages{$p}}) {
+	    if ($maintainer) {
+		if ($maintainer =~ m/(.+?)\s*=\>\s*(.+)/) {
+		    my $oldmaint = $1;
+		    my $newmaint = $2;
+		    my $debmaint = $$package{Maintainer};
+		    if (!grep($debmaint eq $_, split(m:\s*//\s*:, $oldmaint))) {
+			push(@changedmaint,
+			     "  $p (package says $$package{Maintainer}, not $oldmaint)\n");
+		    } else {
+			$$package{Maintainer} = $newmaint;
+		    }
+		} elsif ($$package{Maintainer} eq $maintainer) {
+		    push(@samemaint, "  $p ($maintainer)\n");
+		} else {
+		    printf(STDERR _g(" * Unconditional maintainer override for %s *")."\n", $p) || die $!;
+		    $$package{Maintainer} = $maintainer;
+		}
+	    }
+	    $$package{Priority} = $priority;
+	    $$package{Section} = $section;
+	}
+	$overridden{$p} = 1;
+    }
+
+    close($override_fh);
+}
+
+usage() and exit 1 if not $result;
+
+if (not @ARGV >= 1 && @ARGV <= 3) {
+    warn _g("1 to 3 args expected\n");
+    usage();
+    exit 1;
+}
 
 my $udeb = $options{udeb};
 my $arch = $options{arch};
@@ -93,11 +154,15 @@ else {
      @find_args = ('-name',"*.$ext");
 }
 push @find_args, '-follow';
+
+#push @ARGV, undef	if @ARGV < 2;
+#push @ARGV, ''		if @ARGV < 3;
 my ($binarydir, $override, $pathprefix) = @ARGV;
+
 -d $binarydir or die sprintf(_g("Binary dir %s not found"),
                              $binarydir)."\n";
--e $override or die sprintf(_g("Override file %s not found"),
-                            $override)."\n";
+
+load_override($override);
 
 $pathprefix = '' if not defined $pathprefix;
 
@@ -110,7 +175,6 @@ sub vercmp {
      return $?;
 }
 
-my %packages;
 my $find_h = new IO::Handle;
 open($find_h,'-|','find',"$binarydir/",@find_args,'-print')
      or die sprintf(_g("Couldn't open %s for reading: %s"),
@@ -202,44 +266,6 @@ $packages
     print(STDERR "\n") || die $!;
 }
 
-my (@samemaint,@changedmaint);
-
-
-my %overridden;
-my $override_fh = new IO::File $override,'r'
-    or die sprintf(_g("Couldn't open override file %s: %s"), $override, $!)."\n";
-while (<$override_fh>) {
-    s/\#.*//;
-    s/\s+$//;
-    next unless $_;
-    my ($p,$priority,$section,$maintainer)= split(/\s+/,$_,4);
-    next unless defined($packages{$p});
-    for my $package (@{$packages{$p}}) {
-	 if ($maintainer) {
-	      if ($maintainer =~ m/(.+?)\s*=\>\s*(.+)/) {
-		   my $oldmaint= $1;
-		   my $newmaint= $2;
-		   my $debmaint= $$package{Maintainer};
-		   if (!grep($debmaint eq $_, split(m:\s*//\s*:, $oldmaint))) {
-			push(@changedmaint,
-			     "  $p (package says $$package{Maintainer}, not $oldmaint)\n");
-		   } else {
-			$$package{Maintainer}= $newmaint;
-		   }
-	       } elsif ($$package{Maintainer} eq $maintainer) {
-		   push(@samemaint,"  $p ($maintainer)\n");
-	       } else {
-		   printf(STDERR _g(" * Unconditional maintainer override for %s *")."\n", $p) || die $!;
-		   $$package{Maintainer}= $maintainer;
-	       }
-	  }
-	 $$package{Priority}= $priority;
-	 $$package{Section}= $section;
-    }
-    $overridden{$p} = 1;
-}
-close($override_fh);
-
 my @missingover=();
 
 my $records_written = 0;
-- 
2.39.5