r53071 - in /trunk/dh-make-perl: debian/changelog lib/DhMakePerl.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Fri Feb 19 20:52:41 2010
New Revision: 53071

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53071
Log:
--make: rename existing debian/ directory to debian.bak/

if debian.bak/ already exists, it is removed (recursively) before the rename

Discussion at http://lists.debian.org/debian-perl/2010/02/msg00040.html

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

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=53071&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Fri Feb 19 20:52:41 2010
@@ -2,6 +2,8 @@
 
   * in --refresh mode, overwrite the backups of the modified files under
     debian/
+  * in --make mode, rename any existing debian/ directory to debian.bak/,
+    overwriting the later if it exists
 
  -- Damyan Ivanov <dmn at debian.org>  Fri, 19 Feb 2010 22:47:26 +0200
 

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=53071&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Fri Feb 19 20:52:41 2010
@@ -323,11 +323,16 @@
     move( $tarball, dirname($tarball) . "/${pkgname}_${version}.orig.tar.gz" )
         if ( $tarball && $tarball =~ /(?:\.tar\.gz|\.tgz)$/ );
 
-    # fail before further inspection of the source
-    # $debiandir is set by extract_basic() above
-    -d $debiandir
-        && die
-        "The directory $debiandir is already present and I won't overwrite it: remove it yourself.\n";
+    if ( -d $debiandir ) {
+        warn "W: $debiandir already exists\n" if $self->cfg->verbose;
+        warn "W: moving to $debiandir.bak" if $self->cfg->verbose;
+        if ( -d "$debiandir.bak" ) {
+            warn "W: overwriting existing $debiandir.bak\n"
+                if $self->cfg->verbose;
+            File::Path::rmtree("$debiandir.bak");
+        }
+        rename $debiandir, "$debiandir.bak" or die $!;
+    }
 
     my $apt_contents = $self->get_apt_contents;