Modified: branches/release_1_9/base/src/registry2.0/portuninstall.tcl (69318 => 69319)

--- branches/release_1_9/base/src/registry2.0/portuninstall.tcl	2010-06-30 07:48:21 UTC (rev 69318)
+++ branches/release_1_9/base/src/registry2.0/portuninstall.tcl	2010-06-30 07:52:27 UTC (rev 69319)
@@ -108,18 +108,18 @@
     } elseif { [llength $ilist] == 1 } {
         if {$use_reg2} {
             set port [lindex $ilist 0]
-            if {$v == ""} {
-                set v "[$port version]_[$port revision][$port variants]"
-            }
+            set version [$port version]
+            set revision [$port revision]
+            set variants [$port variants]
         } else {
             set version [lindex [lindex $ilist 0] 1]
             set revision [lindex [lindex $ilist 0] 2]
             set variants [lindex [lindex $ilist 0] 3]
             set active [lindex [lindex $ilist 0] 4]
-            if {$v == ""} {
-                set v "${version}_${revision}${variants}"
-            }
         }
+        if {$v == ""} {
+            set v "${version}_${revision}${variants}"
+        }
     } else {
         throw registry::invalid "Registry error: $portname not registered as installed"
     }

Modified: svn:mergeinfo