portupgrade results listing shows old port version

[milki]

Hi,

I've been wondering for a while, but after a successful portupgrade, the
port version listed is the old version:

--->  Upgrade of devel/git started at: Fri, 25 Feb 2011 23:44:50 -0800
--->  Upgrading 'git-1.7.3.5' to 'git-1.7.4.1' (devel/git)
...
--->  Upgrade of devel/git ended at: Fri, 25 Feb 2011 23:46:57 -0800 (consumed 
00:02:06)
--->  ** Upgrade tasks 1: 1 done, 0 ignored, 0 skipped and 0 failed
--->  Listing the results (+:done / -:ignored / *:skipped / !:failed)
        + devel/git (git-1.7.3.5)
--->  Packages processed: 1 done, 0 ignored, 0 skipped and 0 failed

Would it make more sense to specify the new port version in the listing
results page? I've attached a patch proposal that pulls the new port
version instead.


-- 
milki
mi...@rescomp.berkeley.edu
RSSP-IT programmers

--- bin/portupgrade.orig        2010-11-23 12:29:20.000000000 -0800
+++ bin/portupgrade     2011-02-25 23:27:29.000000000 -0800
@@ -952,10 +952,16 @@
   end
 
   if origin
+    portpkgname = check_pkgname(origin)        # raises CommandFailedError
+  else
+    portpkgname = pkgname
+  end
+
+  if origin
     if result = $results[origin]
-      progress_message "Skipping '#{origin}' (#{pkgname}) because it has 
already #{result.phrase(true)}"
+      progress_message "Skipping '#{origin}' (#{portpkgname}) because it has 
already #{result.phrase(true)}"
 
-      $results << PkgResult.new(origin, :skipped, pkgname)
+      $results << PkgResult.new(origin, :skipped, portpkgname)
       return
     elsif !$keep_going
       deps = pkg.pkgdep || []
@@ -966,8 +972,8 @@
        result = $results[o]
 
        if result && result.failed?
-         progress_message "Skipping '#{origin}' (#{pkgname}) because a 
requisite package '#{dep}' (#{o}) failed (specify -k to force)"
-         $results << PkgResult.new(origin, :skipped, pkgname)
+         progress_message "Skipping '#{origin}' (#{portpkgname}) because a 
requisite package '#{dep}' (#{o}) failed (specify -k to force)"
+         $results << PkgResult.new(origin, :skipped, portpkgname)
          return
        end
       end
@@ -997,11 +1003,11 @@
       end
     end
 
-    $results << PkgResult.new(origin, result ? :done : :ignored, pkgname)
+    $results << PkgResult.new(origin, result ? :done : :ignored, portpkgname)
   rescue IgnoreMarkError => e
-    $results << PkgResult.new(origin, :ignored, pkgname)
+    $results << PkgResult.new(origin, :ignored, portpkgname)
   rescue => e
-    $results << PkgResult.new(origin, e, pkgname)
+    $results << PkgResult.new(origin, e, portpkgname)
   ensure
     $use_packages, $use_packages_only = use_packages, use_packages_only
   end
@@ -1013,7 +1019,7 @@
 
     $pkgdb.autofix
 
-    progress_message "Packaging '#{pkgname}' as dependency"
+    progress_message "Packaging '#{portpkgname}' as dependency"
 
     if $noexecute
       puts "OK? [no]" if $interactive

pgpjFcxE9HSfm.pgp
Description: PGP signature