summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-06-02 09:56:19 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-06-02 09:56:19 +0000
commit796884e0e279777167e83cb22e0c7893f14f39cb (patch)
tree494a7e46399c96fea8c737cd2d994d0d046169b1
parentc9caf51ec391bed1446ae5f27ed02c6283e7560f (diff)
downloadperl-MDK-Common-796884e0e279777167e83cb22e0c7893f14f39cb.tar
perl-MDK-Common-796884e0e279777167e83cb22e0c7893f14f39cb.tar.gz
perl-MDK-Common-796884e0e279777167e83cb22e0c7893f14f39cb.tar.bz2
perl-MDK-Common-796884e0e279777167e83cb22e0c7893f14f39cb.tar.xz
perl-MDK-Common-796884e0e279777167e83cb22e0c7893f14f39cb.zip
preserve sockets and pipes in cp_af1.2.25
-rw-r--r--NEWS4
-rw-r--r--lib/MDK/Common.pm.pl2
-rw-r--r--lib/MDK/Common/File.pm2
3 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ae4d778..4274dad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 1.2.25 - 2 June 2010, by Pascal Terjan
+
+- preserve sockets and pipes in cp_af
+
Version 1.2.24 - 12 January 2010, by Pascal Terjan
- fix whereis_binary to work on absolute symlinks inside chroot
diff --git a/lib/MDK/Common.pm.pl b/lib/MDK/Common.pm.pl
index 4a490f5..266242f 100644
--- a/lib/MDK/Common.pm.pl
+++ b/lib/MDK/Common.pm.pl
@@ -73,7 +73,7 @@ our @ISA = qw(Exporter);
# perl_checker: RE-EXPORT-ALL
our @EXPORT = map { @$_ } map { values %{'MDK::Common::' . $_ . 'EXPORT_TAGS'} } grep { /::$/ } keys %MDK::Common::;
-our $VERSION = "1.2.24";
+our $VERSION = "1.2.25";
1;
EOF
diff --git a/lib/MDK/Common/File.pm b/lib/MDK/Common/File.pm
index cacad59..06bd4fe 100644
--- a/lib/MDK/Common/File.pm
+++ b/lib/MDK/Common/File.pm
@@ -214,7 +214,7 @@ sub cp_with_option {
} elsif (-d $src) {
-d $dest or mkdir $dest, (stat($src))[2] or die "mkdir: can't create directory $dest: $!\n";
cp_with_option($option, glob_($src), $dest);
- } elsif ((-b $src || -c $src) && $keep_special) {
+ } elsif ((-b $src || -c $src || -S $src || -p $src) && $keep_special) {
my @stat = stat($src);
require MDK::Common::System;
MDK::Common::System::syscall_('mknod', $dest, $stat[2], $stat[6]) or die "mknod failed (dev $dest): $!";