Author: sparky
Date: Fri Jun 4 19:13:35 2010
New Revision: 11523
Modified:
toys/rsget.pl/RSGet/Curl.pm
Log:
- don't die if file disappears
- cleaner File::Copy usage
Modified: toys/rsget.pl/RSGet/Curl.pm
==============================================================================
--- toys/rsget.pl/RSGet/Curl.pm (original)
+++ toys/rsget.pl/RSGet/Curl.pm Fri Jun 4 19:13:35 2010
@@ -13,7 +13,7 @@
use WWW::Curl::Multi;
use URI::Escape;
use MIME::Base64;
-use File::Copy;
+use File::Copy ();
use File::Path;
use Fcntl qw(SEEK_SET);
use Encode;
@@ -318,7 +318,8 @@
my $old_msg = "";
if ( $old ) {
rename $fp, $old;
- copy( $old, $fp ) || die "Cannot create backup
file: $!";
+ File::Copy::copy( $old, $fp )
+ or die "Cannot create backup file: $!";
$old =~ s#.*/##;
$old_msg = ", backup saved as '$old'";
}
@@ -463,10 +464,11 @@
$! = undef;
rename $infile, $outfile;
if ( $! ) {
- warn "Cannot rename $infile to $outfile ($!),
copying instead\n"
+ warn "Cannot rename $infile to $outfile ($!),
unsing File::Copy instead\n"
if verbose( 1 );
- copy( $infile, $outfile ) || die "Cannot copy
$infile to $outfile: $!";
- unlink $infile;
+ $! = undef;
+ File::Copy::move( $infile, $outfile )
+ or warn "Cannot move $infile to
$outfile: $!";
}
}
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
