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

[Christoph Martin]

Author: chrism
Date: 2013-08-27 08:58:50 +0000 (Tue, 27 Aug 2013)
New Revision: 66

Modified:
   trunk/apt-show-versions
   trunk/debian/changelog
Log:
releasing version 0.22.2

Modified: trunk/apt-show-versions
===================================================================
--- trunk/apt-show-versions	2013-07-02 09:34:56 UTC (rev 65)
+++ trunk/apt-show-versions	2013-08-27 08:58:50 UTC (rev 66)
@@ -328,15 +328,34 @@
 
 sub print_package {
     my ($package) = @_;
+    my ($pkgname, $archname);
 
     if ($package =~ m/:/) {
-        my ($pkgname, $arch) = split /:/, $package;
-        print_package_internal($pkgname, $arch);
+        ($pkgname, $archname) = split /:/, $package;
     } else {
-        my $pkgs = ($opts{'regex-all'}) ? $apackages : $ipackages;
-        foreach my $arch (sort keys $pkgs->{$package}) {
-            print_package_internal($package, $arch);
+        $pkgname = $package;
+    }
+    
+    my $pkgs = ($opts{'regex-all'}) ? $apackages : $ipackages;
+
+    if ($archname and ! defined $apackages->{$pkgname}{$archname}) {
+        printf("%s not available for architecture %s\n", $pkgname, $archname);
+    } elsif (! defined $pkgs->{$pkgname}) {
+        if ($mode != $MODE_SINGLE || $archname) {
+            printf("%s not installed\n", $package);
+        } elsif (keys(%{$apackages->{$pkgname}})) {
+            my $archlist = "";
+            foreach my $a (sort keys(%{$apackages->{$pkgname}})) {
+                $archlist .= ($archlist ? ", $a" : "$a");
+            }
+            printf("%s not installed (available for: %s)\n", $pkgname, $archlist);
+        } else {
+            printf("%s not installed (not available)\n", $pkgname);
         }
+    } else {
+        foreach my $arch ($archname or sort keys $pkgs->{$pkgname}) {
+            print_package_internal($pkgname, $arch);
+        }
     }
 }
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2013-07-02 09:34:56 UTC (rev 65)
+++ trunk/debian/changelog	2013-08-27 08:58:50 UTC (rev 66)
@@ -1,3 +1,10 @@
+apt-show-versions (0.22.2) unstable; urgency=low
+
+  * fix display for not installed packages (thanks to Greg Klanderman
+    <gak at klanderman.net>) (closes: #715314)
+
+ -- Christoph Martin <christoph.martin at uni-mainz.de>  Tue, 27 Aug 2013 10:40:41 +0200
+
 apt-show-versions (0.22.1) unstable; urgency=low
 
   * fix postinst for new installs (closes: #714563)