[dh-make-perl] 05/05: Use Cwd's realpath for upstream tarball search if main_dir is just "."

Axel Beckert abe at deuxchevaux.org
Sun Jan 19 16:37:28 UTC 2014


This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository dh-make-perl.

commit 987c51dfdd58bd6ea3aa524922ec505e71eb885e
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Jan 19 17:36:38 2014 +0100

    Use Cwd's realpath for upstream tarball search if main_dir is just "."
---
 debian/changelog               | 1 +
 lib/DhMakePerl/Command/make.pm | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 000ae01..023d153 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ dh-make-perl (0.81-1) UNRELEASED; urgency=medium
     guess_tarball($prefix) and guess_debian_tarball() and then using
     guess_tarball() also in setup_dir().
   * Iterate over all supported tar ball suffixes in guess_tarball().
+  * Use Cwd's realpath for upstream tarball search if main_dir is just "."
 
  -- Dima Kogan <dima at secretsauce.net>  Wed, 25 Dec 2013 17:08:35 +0100
 
diff --git a/lib/DhMakePerl/Command/make.pm b/lib/DhMakePerl/Command/make.pm
index ff73669..fd0d1ae 100644
--- a/lib/DhMakePerl/Command/make.pm
+++ b/lib/DhMakePerl/Command/make.pm
@@ -40,6 +40,7 @@ TO BE FILLED
 
 use AptPkg::Cache ();
 use CPAN ();
+use Cwd qw( realpath );
 use Debian::Dependencies      ();
 use Debian::Dependency        ();
 use Debian::WNPP::Query;
@@ -375,7 +376,7 @@ sub setup_dir {
 # 		);
     }
     else {
-        my $maindir = shift(@ARGV) || '.';
+        my $maindir = realpath( shift(@ARGV) || '.' );
         $maindir =~ s/\/$//;
         $self->main_dir($maindir);
         my $guessed_tarball_prefix = catfile( $self->main_dir, "..",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/dh-make-perl.git



More information about the Pkg-perl-cvs-commits mailing list