Give more info about release states in list-upgrades

diff --git a/pear/PEAR/Command/Remote.php b/pear/PEAR/Command/Remote.php
index 205b3dd8b68d2d1a79eed474777049e2632f8b3f..7c44c3e1e9eaae7df7be169c1d3f0ec8270150e4 100644 (file)
--- a/pear/PEAR/Command/Remote.php
+++ b/pear/PEAR/Command/Remote.php
@@ -322,7 +322,7 @@ parameter.
             $latest = $remote->call("package.listLatestReleases");
         } else {
             $latest = $remote->call("package.listLatestReleases", $state);
-            $caption .= ' (' . $state . ')';
+            $caption .= ' (' . implode(', ', PEAR_Common::betterStates($state, true)) . ')';
         }
         $caption .= ':';
         if (PEAR::isError($latest)) {
@@ -342,7 +342,9 @@ parameter.
                 continue;
             }
             extract($info);
-            $inst_version = $reg->packageInfo($package, 'version');
+            $pkginfo = $reg->packageInfo($package);
+            $inst_version = $pkginfo['version'];
+            $inst_state   = $pkginfo['release_state'];
             if (version_compare("$version", "$inst_version", "le")) {
                 // installed version is up-to-date
                 continue;
@@ -356,7 +358,7 @@ parameter.
             } else {
                 $fs = "  -"; // XXX center instead
             }
-            $data['data'][] = array($pkg, $inst_version, $version, $fs);
+            $data['data'][] = array($pkg, "$inst_version ($inst_state)", "$version ($state)", $fs);
         }
         if (empty($data['data'])) {
             $this->ui->outputData('No upgrades available');