[devscripts] 01/05: uscan: No output if upstream == debian and no errors

[Osamu Aoki]

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

osamu pushed a commit to branch master
in repository devscripts.

commit 0a142bd5523d6384fec119a38a5dcdd6b3ad3efd
Author: Osamu Aoki <osamu at debian.org>
Date:   Thu May 5 17:54:14 2016 +0900

    uscan: No output if upstream == debian and no errors
    
    Closes: #820798
---
 debian/changelog | 5 +++++
 scripts/uscan.pl | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3e9a21..ed1f708 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 devscripts (2.16.5) UNRELEASED; urgency=medium
 
+  [ James McCoy ]
   * uscan:
     + Import catfile from File::Spec::Functions to fix use of unqualified
       name.  Thanks to Craig Small for the patch.  (Closes: #823218)
 
+  [ Osamu Aoki ]
+  * uscan:
+    + No output if upstream == debian and no errors.  (Closes: #820798)
+
  -- James McCoy <jamessan at debian.org>  Mon, 02 May 2016 19:41:06 -0400
 
 devscripts (2.16.4) unstable; urgency=medium
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 2439c19..1e64928 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -3324,9 +3324,9 @@ EOF
 	uscan_msg "Newest version of $pkg on remote site is $newversion, specified download version is $download_version\n";
 	$found++;
     } elsif ($options{'versionmode'} eq 'newer') {
-	uscan_msg "Newest version of $pkg on remote site is $newversion, local version is $lastversion\n" .
-	    ($mangled_lastversion eq $lastversion ? "" : " (mangled local version is $mangled_lastversion)\n");
 	if ($compver eq 'newer') {
+	    uscan_msg "Newest version of $pkg on remote site is $newversion, local version is $lastversion\n" .
+		($mangled_lastversion eq $lastversion ? "" : " (mangled local version is $mangled_lastversion)\n");
 	    # There's a newer upstream version available, which may already
 	    # be on our system or may not be
 	    uscan_msg "   => Newer package available from\n" .
@@ -3334,6 +3334,8 @@ EOF
 	    $dehs_tags{'status'} = "newer package available";
 	    $found++;
 	} elsif ($compver eq 'same') {
+	    uscan_verbose "Newest version of $pkg on remote site is $newversion, local version is $lastversion\n" .
+		($mangled_lastversion eq $lastversion ? "" : " (mangled local version is $mangled_lastversion)\n");
 	    uscan_verbose "   => Package is up to date for from\n" .
 		      "      $upstream_url\n";
 	    $dehs_tags{'status'} = "up to date";
@@ -3346,6 +3348,8 @@ EOF
 		$download = 0;
 	    }
 	} else { # $compver eq 'old'
+	    uscan_verbose "Newest version of $pkg on remote site is $newversion, local version is $lastversion\n" .
+		($mangled_lastversion eq $lastversion ? "" : " (mangled local version is $mangled_lastversion)\n");
 	    uscan_verbose "   => Only older package available from\n" .
 		      "      $upstream_url\n";
 	    $dehs_tags{'status'} = "only older package available";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git