This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit 62260e85dd5927afa2340198fe754c692a1d6c62 Author: James McCoy <[email protected]> Date: Mon Jan 20 23:59:45 2014 -0500 Fix regex in get_main_source_dir Closes: #735906 Signed-off-by: James McCoy <[email protected]> --- debian/changelog | 1 + scripts/uscan.pl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 38fb06b..6d6e645 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ devscripts (2.14.0) UNRELEASED; urgency=low + Move keyring location for signature verification under debian/upstream/. + Use the armored keyring debian/upstream/signing-key.asc for signature verification if the unarmored keyring doesn't exist. (Closes: #720957) + + Fix regex in get_main_source_dir. (Closes: #735906) -- Jakub Wilk <[email protected]> Fri, 27 Dec 2013 18:39:11 +0100 diff --git a/scripts/uscan.pl b/scripts/uscan.pl index 2d293e5..4438e25 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -2222,7 +2222,7 @@ sub get_main_source_dir($$$$) { $main_source_dir = $tempdir . '/' . $pkg . '-' . $newversion . $excludesuffix . '.orig'; mkdir($main_source_dir) or uscan_die("Unable to create temporary source directory $main_source_dir\n"); foreach my $file (@files) { - unless ($file =~ /^\.\.?/) { + unless ($file =~ /^\.\.?$/) { if ( -d "${tempdir}/$file" ) { # HELP: why can't perl move not move directories???? system('mv', "${tempdir}/$file", $main_source_dir); -- 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
