This is an automated email from the git hooks/post-receive script. terceiro pushed a commit to branch master in repository devscripts.
commit cc725add83f9466d4eab0fb9ac7b6618bb80eaeb Author: Antonio Terceiro <[email protected]> Date: Sun Jan 31 18:47:40 2016 -0200 uscan: fix English phrases when logging download-related actions --- debian/changelog | 1 + scripts/uscan.pl | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 164640c..104b512 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ devscripts (2.16.1) UNRELEASED; urgency=medium don't have a file called 'watch'. This removes several annoying warnings when uscan is run on a package that has several directories called 'debian' in its upstream source. + - fix English phrases when logging download-related actions * mk-build-deps: - When installing, pass `-o Debug::pkgProblemResolver=yes` to `apt-get install` so that when build dependencies can't be satisfied, you know why. diff --git a/scripts/uscan.pl b/scripts/uscan.pl index 2f93227..810cdd6 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -3430,16 +3430,16 @@ EOF if ($options{'pgpmode'} ne 'previous') { # try download package if ( $download == 3 and -e "$destdir/$newfile_base") { - uscan_verbose "Download and overwrite the existing file: $newfile_base\n"; + uscan_verbose "Downloading and overwriting existing file: $newfile_base\n"; } elsif ( -e "$destdir/$newfile_base") { - uscan_verbose "Don\'t download and use the existing file: $newfile_base\n"; + uscan_verbose "Not downloading, using existing file: $newfile_base\n"; $download_available = 1; } elsif ($download >0) { uscan_verbose "Downloading upstream package: $newfile_base\n"; $download_available = $downloader->($upstream_url, "$destdir/$newfile_base", $options{'mode'}); - } else { # $download = 0, - uscan_verbose "Don\'t downloading upstream package: $newfile_base\n"; - $download_available = 0; + } else { # $download = 0, + uscan_verbose "Not downloading upstream package: $newfile_base\n"; + $download_available = 0; } # Decompress archive if requested and applicable -- 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
