This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit 9d7f9113f9f78686e1d0ff2c809d9110730017c9 Author: James McCoy <[email protected]> Date: Mon Aug 11 22:35:43 2014 -0400 debcheckout: Always define $origtgz_name when given a URL $origtgz_name should either be an empty string or a possible package name for later use in unpack_source(). Closes: #757614 Signed-off-by: James McCoy <[email protected]> --- debian/changelog | 2 ++ scripts/debcheckout.pl | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 32e97d6..a1a95e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ devscripts (2.14.7) UNRELEASED; urgency=low actually uses said directory. (Closes: #544366) * mk-build-deps: Pass the file, not package, names to unlink when --remove is given. (Closes: #757481) + * debcheckout: Always define $origtgz_name when a URL is specified on the + command line. (Closes: #757614) -- Cyril Brulebois <[email protected]> Fri, 08 Aug 2014 01:27:12 +0200 diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl index e39fb06..8bfe0d1 100755 --- a/scripts/debcheckout.pl +++ b/scripts/debcheckout.pl @@ -1032,7 +1032,6 @@ sub main() { # when --package is given, use it if ($use_package) { $pkg = $use_package; - $origtgz_name = $use_package; # FIXME: this should rather set srcpkg in unpack_source() directly # else guess package from url } elsif ($repo_url =~ m!/trunk/([a-z0-9.+-]+)!) { # svn with {trunk,tags,branches}/$pkg $pkg = $1; @@ -1043,7 +1042,7 @@ sub main() { } elsif ($repo_url =~ /([a-z0-9.+-]+)$/) { # catch-all $pkg = $1; } - + $origtgz_name = $pkg; # FIXME: this should rather set srcpkg in unpack_source() directly } else { # package name passed on the command line ($version, $repo_type, $repo_url, $origtgz_name) = find_repo($pkg, $version); unless ($repo_type) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
