r1596: * Remove duplicate packages from DOPACKAGES after argument processing.

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

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index f22e8171da97e99b5b749d05835a491b2f9a1d4a..0eea0180f40f9195ffcbb04e452e94105f2f1585 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -11,9 +11,9 @@ use Exporter;
 use vars qw(@ISA @EXPORT %dh);
 @ISA=qw(Exporter);
 @EXPORT=qw(&init &doit &complex_doit &verbose_print &error &warning &tmpdir
-           &pkgfile &pkgext &isnative &autoscript &filearray &filedoublearray
-           &GetPackages &basename &dirname &xargs %dh &compat &addsubstvar
-           &delsubstvar &excludefile);
+           &pkgfile &pkgext &pkgfilename &isnative &autoscript &filearray
+           &filedoublearray &GetPackages &basename &dirname &xargs %dh
+           &compat &addsubstvar &delsubstvar &excludefile);
 
 my $max_compat=4;
 
@@ -45,7 +45,7 @@ sub init {
 
        # Another way to set excludes.
        if (exists $ENV{DH_ALWAYS_EXCLUDE} && length $ENV{DH_ALWAYS_EXCLUDE}) {
-               push @{$dh{EXCLUDE}}, $ENV{DH_ALWAYS_EXCLUDE};
+               push @{$dh{EXCLUDE}}, split(":", $ENV{DH_ALWAYS_EXCLUDE});
        }
        
        # Generate EXCLUDE_FIND.
@@ -54,8 +54,8 @@ sub init {
                foreach (@{$dh{EXCLUDE}}) {
                        my $x=$_;
                        $x=escape_shell($x);
-                       $x=~s/\./\\\\./g;
-                       $dh{EXCLUDE_FIND}.="-regex .\\*$x.\\* -or ";
+                       $x=~s/\./\\./g;
+                       $dh{EXCLUDE_FIND}.="-regex .*$x.* -or ";
                }
                $dh{EXCLUDE_FIND}=~s/ -or $//;
        }
@@ -117,7 +117,7 @@ sub escape_shell {
                        # This does make -V"foo bar" turn into "-Vfoo bar",
                        # but that will be parsed identically by the shell
                        # anyway..
-                       $word=~s/([\n`\$"\\])/\$1/g;
+                       $word=~s/([\n`\$"\\])/\\$1/g;
                        push @ret, "\"$word\"";
                }
                else {
@@ -139,7 +139,8 @@ sub doit {
        verbose_print(escape_shell(@_));
 
        if (! $dh{NO_ACT}) {
-               system(@_) == 0 || error("command returned error code");
+               my $ret=system(@_);
+               $ret == 0 || error("command returned error code $ret");
        }
 }
 
@@ -246,7 +247,7 @@ sub compat {
        }
        elsif (-e 'debian/compat') {
                # Try the file..
-               open (COMPAT_IN, "debian/compat") || die "debian/compat: $!";
+               open (COMPAT_IN, "debian/compat") || error "debian/compat: $!";
                $c=<COMPAT_IN>;
                chomp $c;
        }
@@ -282,10 +283,18 @@ sub tmpdir {
 #   * debian/package.filename.buildarch
 #   * debian/package.filename
 #   * debian/file (if the package is the main package)
+# If --name was specified then tonly the first two are tried, and they must
+# have the name after the pacage name:
+#   * debian/package.name.filename.buildarch
+#   * debian/package.name.filename
 sub pkgfile {
        my $package=shift;
        my $filename=shift;
 
+       if (defined $dh{NAME}) {
+               $filename="$dh{NAME}.$filename";
+       }
+       
        if (-f "debian/$package.$filename.".buildarch()) {
                return "debian/$package.$filename.".buildarch();
        }
@@ -301,7 +310,7 @@ sub pkgfile {
 }
 
 # Pass it a name of a binary package, it returns the name to prefix to files
-# in debian for this package.
+# in debian/ for this package.
 sub pkgext {
        my $package=shift;
 
@@ -311,6 +320,18 @@ sub pkgext {
        return "$package.";
 }
 
+# Pass it the name of a binary package, it returns the name to install
+# files by in eg, etc. Normally this is the same, but --name can override
+# it.
+sub pkgfilename {
+       my $package=shift;
+
+       if (defined $dh{NAME}) {
+               return $dh{NAME};
+       }
+       return $package;
+}
+
 # Returns 1 if the package is a native debian package, null otherwise.
 # As a side effect, sets $dh{VERSION} to the version of this package.
 {
@@ -391,7 +412,7 @@ sub delsubstvar {
        my $substvarfile="debian/${ext}substvars";
 
        if (-e $substvarfile) {
-               complex_doit("grep -v '^${substvar}=' $substvarfile > $substvarfile.new || true");
+               complex_doit("grep -s -v '^${substvar}=' $substvarfile > $substvarfile.new || true");
                doit("mv", "$substvarfile.new","$substvarfile");
        }
 }
@@ -415,7 +436,7 @@ sub addsubstvar {
        my $line="";
        if (-e $substvarfile) {
                my %items;
-               open(SUBSTVARS_IN, "$substvarfile") || die "read $substvarfile: $!";
+               open(SUBSTVARS_IN, "$substvarfile") || error "read $substvarfile: $!";
                while (<SUBSTVARS_IN>) {
                        chomp;
                        if (/^\Q$substvar\E=(.*)/) {
@@ -438,7 +459,11 @@ sub addsubstvar {
        }
 
        if (length $line) {
-                complex_doit("echo '${substvar}=$line' >> $substvarfile");
+                complex_doit("(grep -s -v ${substvar} $substvarfile; echo ".escape_shell("${substvar}=$line").") > $substvarfile.new");
+                doit("mv", "$substvarfile.new", $substvarfile);
+       }
+       else {
+               delsubstvar($package,$substvar);
        }
 }
 
@@ -498,7 +523,7 @@ sub excludefile {
        sub buildarch {
                return $arch if defined $arch;
 
-               $arch=`dpkg --print-architecture` || error($!);
+               $arch=`dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null` || error($!);
                chomp $arch;
                return $arch;
        }