r76461 - /trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Fri Jun 24 12:49:02 2011
New Revision: 76461

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=76461
Log:
make: check the results when copying/moving tarballs around

Modified:
    trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm?rev=76461&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm Fri Jun 24 12:49:02 2011
@@ -95,13 +95,12 @@
     $bin->short_description( $self->cfg->desc )
         if $self->cfg->desc;
 
-    move(
-        $tarball,
-        sprintf(
-            "%s/%s_%s.orig.tar.gz",
-            dirname($tarball), $self->pkgname, $self->version
-        )
-    ) if ( $tarball && $tarball =~ /(?:\.tar\.gz|\.tgz)$/ );
+    if ( $tarball and $tarball =~ /(?:\.tar\.gz|\.tgz)$/ ) {
+        my $dest = sprintf( "%s/%s_%s.orig.tar.gz",
+            dirname($tarball), $self->pkgname, $self->version );
+
+        move( $tarball, $dest ) or die "move($tarball, $dest): $!";
+    }
 
     if ( -d $self->debian_dir ) {
         $self->warning( $self->debian_dir . ' already exists' );
@@ -276,7 +275,7 @@
         $tarball .= $dist->pretty_id;
         $self->main_dir( $dist->dir );
 
-        copy( $tarball, $orig_pwd );
+        copy( $tarball, $orig_pwd ) or die "copy($tarball, $orig_pwd): $!";
         $tarball = $orig_pwd . "/" . basename($tarball);
 
         # build_dir contains a random part since 1.88_59