Only enable executable config files in v9. The quality of file permissions in debian...

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

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 5a7c3e4a696172de077ba3f387241d0fa162517b..3940c05f08829b1c5162d82303a0a66294ee9fe8 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -18,7 +18,7 @@ use vars qw(@ISA @EXPORT %dh);
            &inhibit_log &load_log &write_log &commit_override_log
            &dpkg_architecture_value &sourcepackage
            &is_make_jobserver_unavailable &clean_jobserver_makeflags
-           &cross_command &set_buildflags);
+           &cross_command &set_buildflags &get_buildoption);
 
 my $max_compat=9;
 
@@ -146,6 +146,8 @@ sub write_log {
        my $cmd=shift;
        my @packages=@_;
 
+       return if $dh{NO_ACT};
+
        foreach my $package (@packages) {
                my $log=logfile($package);
                open(LOG, ">>", $log) || error("failed to write to ${log}: $!");
@@ -157,6 +159,8 @@ sub write_log {
 sub commit_override_log {
        my @packages=@_;
 
+       return if $dh{NO_ACT};
+
        foreach my $package (@packages) {
                my @log=map { remove_override($_) } load_log($package);
                my $log=logfile($package);
@@ -324,6 +328,7 @@ sub dirname {
 
        sub compat {
                my $num=shift;
+               my $nowarn=shift;
        
                if (! defined $c) {
                        $c=1;
@@ -345,7 +350,7 @@ sub dirname {
                        }
                }
 
-               if ($c <= 4 && ! $warned_compat) {
+               if ($c <= 4 && ! $warned_compat && ! $nowarn) {
                        warning("Compatibility levels before 5 are deprecated.");
                        $warned_compat=1;
                }
@@ -608,12 +613,22 @@ sub filedoublearray {
        my $file=shift;
        my $globdir=shift;
 
+       # executable confi files are a v9 thing.
+       my $x=! compat(8) && -x $file;
+       if ($x) {
+               require Cwd;
+               my $cmd=Cwd::abs_path($file);
+               open (DH_FARRAY_IN, "$cmd |") || error("cannot run $file: $!");
+       }
+       else {
+               open (DH_FARRAY_IN, $file) || error("cannot read $file: $!");
+       }
+
        my @ret;
-       open (DH_FARRAY_IN, $file) || error("cannot read $file: $!");
        while (<DH_FARRAY_IN>) {
                chomp;
                # Only ignore comments and empty lines in v5 mode.
-               if (! compat(4)) {
+               if (! compat(4) && ! $x)  {
                        next if /^#/ || /^$/;
                }
                my @line;
@@ -622,7 +637,7 @@ sub filedoublearray {
                # The tricky bit is that the glob expansion is done
                # as if we were in the specified directory, so the
                # filenames that come out are relative to it.
-               if (defined $globdir && ! compat(2)) {
+               if (defined $globdir && ! compat(2) && ! $x) {
                        foreach (map { glob "$globdir/$_" } split) {
                                s#^$globdir/##;
                                push @line, $_;
@@ -633,7 +648,8 @@ sub filedoublearray {
                }
                push @ret, [@line];
        }
-       close DH_FARRAY_IN;
+
+       close DH_FARRAY_IN || error("problem reading $file: $!");
        
        return @ret;
 }
@@ -922,4 +938,21 @@ sub set_buildflags {
        }
 }
 
+# Gets a DEB_BUILD_OPTIONS option, if set.
+sub get_buildoption {
+       my $wanted=shift;
+
+       return undef unless exists $ENV{DEB_BUILD_OPTIONS};
+
+       foreach my $opt (split(/\s+/, $ENV{DEB_BUILD_OPTIONS})) {
+               # currently parallel= is the only one with a parameter
+               if ($opt =~ /^parallel=(-?\d+)$/ && $wanted eq 'parallel') {
+                       return $1;
+               }
+               elsif ($opt eq $wanted) {
+                       return 1;
+               }
+       }
+}
+
 1