Allow individual debhelper programs to define their own special options by passing...

[debhelper.git] / Debian / Debhelper / Dh_Lib.pm

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 80f563870da68a57b2ef2d23477b5b4061dcb319..82efc5be241e7e506ea8a7a3b99e008fafe2c3c9 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -2,7 +2,7 @@
 #
 # Library functions for debhelper programs, perl version.
 #
-# Joey Hess, GPL copyright 1997-2000.
+# Joey Hess, GPL copyright 1997-2008.
 
 package Debian::Debhelper::Dh_Lib;
 use strict;
@@ -14,11 +14,14 @@ use vars qw(@ISA @EXPORT %dh);
            &pkgfile &pkgext &pkgfilename &isnative &autoscript &filearray
            &filedoublearray &getpackages &basename &dirname &xargs %dh
            &compat &addsubstvar &delsubstvar &excludefile &package_arch
-           &is_udeb &udeb_filename &debhelper_script_subst &escape_shell);
+           &is_udeb &udeb_filename &debhelper_script_subst &escape_shell
+           &inhibit_log);
 
-my $max_compat=6;
+my $max_compat=7;
 
 sub init {
+       my %params=@_;
+
        # If DH_OPTIONS is set, prepend it @ARGV.
        if (defined($ENV{DH_OPTIONS})) {
                # Ignore leading/trailing whitespace.
@@ -41,7 +44,7 @@ sub init {
        if ($parseopt) {
                eval "use Debian::Debhelper::Dh_Getopt";
                error($!) if $@;
-               %dh=Debian::Debhelper::Dh_Getopt::parseopts();
+               Debian::Debhelper::Dh_Getopt::parseopts($params{options});
        }
 
        # Another way to set excludes.
@@ -108,6 +111,26 @@ sub init {
        }
 }
 
+# Run at exit. Add the command to the log files for the packages it acted
+# on, if it's exiting successfully.
+my $write_log=1;
+sub END {
+       if ($? == 0 && $write_log) {
+               my $cmd=basename($0);
+               foreach my $package (@{$dh{DOPACKAGES}}) {
+                       my $ext=pkgext($package);
+                       my $log="debian/${ext}debhelper.log";
+                       open(LOG, ">>", $log) || error("failed to write to ${log}: $!");
+                       print LOG $cmd."\n";
+                       close LOG;
+               }
+       }
+}
+
+sub inhibit_log {
+       $write_log=0;
+}
+
 # Pass it an array containing the arguments of a shell command like would
 # be run by exec(). It turns that into a line like you might enter at the
 # shell, escaping metacharacters and quoting arguments that contain spaces.
@@ -320,18 +343,22 @@ sub pkgfile {
                $filename="$dh{NAME}.$filename";
        }
        
-       if (-f "debian/$package.$filename.".buildarch()) {
-               return "debian/$package.$filename.".buildarch();
-       }
-       elsif (-f "debian/$package.$filename") {
-               return "debian/$package.$filename";
+       my @try=("debian/$package.$filename.".buildarch(),
+                "debian/$package.$filename");
+       if ($package eq $dh{MAINPACKAGE}) {
+               push @try, "debian/$filename";
        }
-       elsif ($package eq $dh{MAINPACKAGE} && -f "debian/$filename") {
-               return "debian/$filename";
-       }
-       else {
-               return "";
+       
+       foreach my $file (@try) {
+               if (-f $file &&
+                   (! $dh{IGNORE} || ! exists $dh{IGNORE}->{$file})) {
+                       return $file;
+               }
+
        }
+
+       return "";
+
 }
 
 # Pass it a name of a binary package, it returns the name to prefix to files
@@ -488,7 +515,7 @@ sub addsubstvar {
                else {
                        delete $items{$str};
                }
-               $line=join(", ", keys %items);
+               $line=join(", ", sort keys %items);
        }
        elsif (! $remove) {
                $line=$str;