In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/e42bf9ad925e88cba25f703da37689d11bdf6cad?hp=c4bbe9115dcbb814be0e46c740de46d2e1498dc2>

- Log -----------------------------------------------------------------
commit e42bf9ad925e88cba25f703da37689d11bdf6cad
Author: Aaron Crane <[email protected]>
Date:   Sun Mar 19 09:57:37 2017 +0000

    Porting/sync-with-cpan: honour exec-bit whitelist
    
    Reported by kid51++

M       Porting/sync-with-cpan

commit b27c755c1786357fcd8f586663c4d84c918af50e
Author: Aaron Crane <[email protected]>
Date:   Sun Mar 19 09:58:56 2017 +0000

    Porting/sync-with-cpan: handle absence of "." from @INC

M       Porting/sync-with-cpan
-----------------------------------------------------------------------

Summary of changes:
 Porting/sync-with-cpan | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Porting/sync-with-cpan b/Porting/sync-with-cpan
index 8245e5cd66..e6cfd8f36e 100755
--- a/Porting/sync-with-cpan
+++ b/Porting/sync-with-cpan
@@ -158,7 +158,7 @@ our %Modules;
 
 use autodie;
 
-require "Porting/Maintainers.pl";
+require "./Porting/Maintainers.pl";
 
 my $MAKE_LOG = 'make.log';
 
@@ -482,6 +482,15 @@ if (@de_exec && @delete) {
     @de_exec = grep {!$delete {$_}} @de_exec;
 }
 
+#
+# Mustn't change the +x bit on files that are whitelisted
+#
+if (@de_exec) {
+    my %permitted = map +(tr/\n//dr => 1), grep !/^#/,
+        do { local @ARGV = '../Porting/exec-bit.txt'; <> };
+    @de_exec = grep !$permitted{"cpan/$pkg_dir/$_"}, @de_exec;
+}
+
 say "unlink $pkg_dir/$_" for @delete;
 say "git add $pkg_dir/$_" for @commit;
 say "git rm -f $pkg_dir/$_" for @gone;

--
Perl5 Master Repository

Reply via email to