[Pkg-asv-commits] r40 - in trunk: . debian

[ahoenen-guest at alioth.debian.org]

Author: ahoenen-guest
Date: 2008-09-14 07:48:07 +0000 (Sun, 14 Sep 2008)
New Revision: 40

Added:
   trunk/debian/source.lintian-overrides
Modified:
   trunk/apt-show-versions
   trunk/debian/apt-show-versions.postinst
   trunk/debian/changelog
Log:
* Also consider manual upgrade possibilities when upgradeable option is set.
  Thanks to Anders Bostr?\195?\182m for reporting.  (Closes: #498699)
* Remove path from a-s-v call in postinst.  Thanks, lintian.
* Avoid false NMU positives in lintian by a temporary override (needed until
  "christoph.martin" has been added to the official Debian keyring).
* Adapt release numbers in a-s-v script.


Modified: trunk/apt-show-versions
===================================================================
--- trunk/apt-show-versions	2008-09-05 07:50:10 UTC (rev 39)
+++ trunk/apt-show-versions	2008-09-14 07:48:07 UTC (rev 40)
@@ -11,7 +11,7 @@
 
 # Author: Christoph Martin <martin at uni-mainz.de>
 # Maintainer: Christoph Martin <martin at uni-mainz.de>
-# Version: 0.14
+# Version: 0.15
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -53,7 +53,7 @@
 my $policy = $cache->policy;
 
 my $ASV_VERSION;
-$ASV_VERSION ='0.14';
+$ASV_VERSION ='0.15';
 
 # Provide some constants (to avoid redundant literals).
 my $ARCHIVE  = 'Archive';
@@ -332,7 +332,7 @@
     # whether to suppress all printing for the package can be executed only at
     # a later stage.
     my @print_info = ();
-    my $suppress_print = 0;  # The default case is no suppression.
+    my $is_upgradeable = 0;  # Intialize with: not upgradeable.
     # To guarantee tabular printing of the package's releases some further
     # variables are needed:
     my $max_package_len = 0;
@@ -414,20 +414,9 @@
                 push @print_info, @version_info if ($found);
                 $aversion = $version;
             }
+            $is_upgradeable = 1 if ($found == 2);
             last if $found;
         }
-        if ($opts{'upgradeable'} and $found != 2) {
-            if ($mode == $MODE_SINGLE) {
-                # Caller expects single given package to be upgradeable.
-                # Signal failure of this expectation with a special exit code.
-                exit 2;
-            }
-            else {
-                # Upgradeable option is set, but current package is not
-                # upgradeable.  Thus suppress all output for it.
-                $suppress_print = 1;
-            }
-        }
         if ($aversion && ($vs->compare($iversion, $aversion) > 0)) {
             # Test whether installed version is newer
             # than all available versions.
@@ -467,6 +456,7 @@
                              " *manually* upgradeable from $iversion to " .
                              "$aversion\n");
                         $found = 1;
+                        $is_upgradeable = 1;
                         last;
                     }
                 }
@@ -482,8 +472,16 @@
              ? " (even not available)\n" : "\n");
     }
 
+    if ($opts{'upgradeable'}
+        and not $is_upgradeable
+        and $mode == $MODE_SINGLE) {
+        # Caller expects single given package to be upgradeable.
+        # Signal failure of this expectation with a special exit code.
+        exit 2;
+    }
+
     # Print loop
-    unless ($suppress_print) {
+    unless ($opts{'upgradeable'} and not $is_upgradeable) {
         foreach my $print_info (@print_info) {
             if (ref $print_info) {
                 printf("%*s %*s %*s %s\n",

Modified: trunk/debian/apt-show-versions.postinst
===================================================================
--- trunk/debian/apt-show-versions.postinst	2008-09-05 07:50:10 UTC (rev 39)
+++ trunk/debian/apt-show-versions.postinst	2008-09-14 07:48:07 UTC (rev 40)
@@ -26,7 +26,7 @@
 case "$1" in
     configure)
 	echo "** initializing cache. This may take a while **"
-	/usr/bin/apt-show-versions -i
+	apt-show-versions -i
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-09-05 07:50:10 UTC (rev 39)
+++ trunk/debian/changelog	2008-09-14 07:48:07 UTC (rev 40)
@@ -1,9 +1,17 @@
-apt-show-versions (0.15) unstable; urgency=low
+apt-show-versions (0.15) UNRELEASED; urgency=low
 
-  * call apt-show-versions without path in cron.daily 
+  [ Christoph Martin ]
+  * call apt-show-versions without path in cron.daily
 
- -- Christoph Martin <Christoph.Martin at Uni-Mainz.DE>  Fri,  5 Sep 2008 09:47:38 +0200
+  [ Andreas Hoenen ]
+  * Also consider manual upgrade possibilities when upgradeable option is set.
+    Thanks to Anders Boström for reporting.  (Closes: #498699)
+  * Remove path from a-s-v call in postinst.  Thanks, lintian.
+  * Avoid false NMU positives in lintian by a temporary override (needed until
+    "christoph.martin" has been added to the official Debian keyring).
 
+ -- Andreas Hoenen <andreas at hoenen-terstappen.de>  Sun, 14 Sep 2008 09:44:56 +0200
+
 apt-show-versions (0.14) unstable; urgency=low
 
   [ Andreas Hoenen ]

Added: trunk/debian/source.lintian-overrides
===================================================================
--- trunk/debian/source.lintian-overrides	                        (rev 0)
+++ trunk/debian/source.lintian-overrides	2008-09-14 07:48:07 UTC (rev 40)
@@ -0,0 +1,7 @@
+# To cope with the differences in upload handling between the backports and
+# master repositories the maintainer is "christoph.martin", but the uploader is
+# "Christoph.Martin".  Thus the NMU checks raise false positives.
+# These overrides will become superfluous when "christoph.martin" has been
+# added to the official Debian keyring.
+apt-show-versions source: changelog-should-mention-nmu
+apt-show-versions source: source-nmu-has-incorrect-version-number