r25712 - in /trunk/dh-make-perl: debian/changelog dh-make-perl

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Tue Sep 30 21:00:43 2008
New Revision: 25712

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=25712
Log:
Check for an existing ./debian directory earlier, there's no use in
collecting all the information if we `die' anyway; thanks to Mark Lawrence
for the bug report (closes: #500685).

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/dh-make-perl

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=25712&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Tue Sep 30 21:00:43 2008
@@ -15,6 +15,9 @@
     found.
   * Fix typo in minimum Perl version number, thanks to Niko Tyni for spotting.
     Closes: #499730
+  * Check for an existing ./debian directory earlier, there's no use in
+    collecting all the information if we `die' anyway; thanks to Mark Lawrence
+    for the bug report (closes: #500685).
 
  -- Gunnar Wolf <gwolf at debian.org>  Thu, 07 Aug 2008 15:49:12 -0500
 

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=25712&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Tue Sep 30 21:00:43 2008
@@ -208,6 +208,11 @@
 }
 
 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";
+
 $module_build = (-f "$maindir/Build.PL") ? "Module-Build" : "MakeMaker";
 extract_changelog($maindir);
 extract_docs($maindir);
@@ -240,7 +245,6 @@
 print "Found changelog: $changelog\n" if defined $changelog;
 print "Found docs: @docs\n";
 print "Found examples: @examples\n" if @examples;
--d $debiandir && die "The directory $debiandir is already present and I won't overwrite it: remove it yourself.\n";
 # start writing out the data
 mkdir ($debiandir, 0755) || die "Cannot create $debiandir dir: $!\n";
 create_control("$debiandir/control");