summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2010-01-05 00:14:23 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2010-01-05 00:14:23 +0000
commit508b079cc04c98afb841270c5ccb4543ced0eb27 (patch)
treeb8541b2041f66f2c3efc57934850b6ebdd7a6c9e
parenta26f38ecb5333a71a35ddf489a8da5ccfeba3c7c (diff)
Ignore CVS dir in private copy of libscan like real one does.
-rw-r--r--gnu/usr.bin/perl/ext/Compress-Raw-Bzip2/private/MakeUtil.pm3
-rw-r--r--gnu/usr.bin/perl/ext/Compress-Raw-Zlib/private/MakeUtil.pm3
2 files changed, 4 insertions, 2 deletions
diff --git a/gnu/usr.bin/perl/ext/Compress-Raw-Bzip2/private/MakeUtil.pm b/gnu/usr.bin/perl/ext/Compress-Raw-Bzip2/private/MakeUtil.pm
index e5959106542..598bfe7f92f 100644
--- a/gnu/usr.bin/perl/ext/Compress-Raw-Bzip2/private/MakeUtil.pm
+++ b/gnu/usr.bin/perl/ext/Compress-Raw-Bzip2/private/MakeUtil.pm
@@ -35,7 +35,8 @@ sub MY::libscan
my $path = shift;
return undef
- if $path =~ /(~|\.bak|_bak)$/ ||
+ if $path =~ /^(?:RCS|CVS|SCCS|\.svn|_darcs)$/ ||
+ $path =~ /(~|\.bak|_bak)$/ ||
$path =~ /\..*\.sw(o|p)$/ ||
$path =~ /\B\.svn\b/;
diff --git a/gnu/usr.bin/perl/ext/Compress-Raw-Zlib/private/MakeUtil.pm b/gnu/usr.bin/perl/ext/Compress-Raw-Zlib/private/MakeUtil.pm
index e5959106542..598bfe7f92f 100644
--- a/gnu/usr.bin/perl/ext/Compress-Raw-Zlib/private/MakeUtil.pm
+++ b/gnu/usr.bin/perl/ext/Compress-Raw-Zlib/private/MakeUtil.pm
@@ -35,7 +35,8 @@ sub MY::libscan
my $path = shift;
return undef
- if $path =~ /(~|\.bak|_bak)$/ ||
+ if $path =~ /^(?:RCS|CVS|SCCS|\.svn|_darcs)$/ ||
+ $path =~ /(~|\.bak|_bak)$/ ||
$path =~ /\..*\.sw(o|p)$/ ||
$path =~ /\B\.svn\b/;