Changeset 4300 for trunk/base

Timestamp:

Dec 25, 2003, 9:11:28 AM (20 years ago)

Author:

jkh

Message:

Fix for wbb4's receipt uninstall code.
Bug: 1324
Submitted by: pguyot@… and wbb4@…

Location:

trunk/base/src

Files:

• darwinports1.0/darwinports.tcl (modified) (1 diff)
• port1.0/portuninstall.tcl (modified) (1 diff)

trunk/base/src/darwinports1.0/darwinports.tcl

@@ -713 +713 @@
 }
 
-proc dportregistry::delete {portname {portversion 1.0}} {
+proc dportregistry::delete {portname {portversion 0}} {
     global darwinports::registry.path
 
-    # Try both versions, just to be sure.
-    exec rm -f [file join ${darwinports::registry.path} ${portname}-${portversion}]
-    exec rm -f [file join ${darwinports::registry.path} ${portname}-${portversion}].bz2
+    # regex match case, as in exists
+    if {$portversion == 0} {
+                set x [glob -nocomplain [file join ${darwinports::registry.path} ${portname}-*]]
+                if {[string length $x]} {
+                    exec rm -f [lindex $x 0]
+                }
+        } else {
+                # Remove the file (with or without .bz2 suffix)
+                set filename [file join ${darwinports::registry.path} ${portname}-${portversion}]
+                if { [file exists $filename] } {
+                        exec rm -rf $filename
+                } elseif { [file exists ${filename}.bz2] } {
+                        exec rm -rf ${filename}.bz2
+                }
+        }
 }
 

trunk/base/src/port1.0/portuninstall.tcl

@@ -127 +127 @@
             }
             if {!$uninst_err || [tbool uninstall.force]} {
-                if {[regexp .bz2$ $rfile]} {
-                        regsub {.bz2$} $rfile {} r_file
-                        set r_version [lindex [split $r_file -] 1]
-                } else {
-                        set r_version [lindex [split $rfile -] 1]
-                }
-                registry_delete $portname $r_version
-                return 0
+                        registry_delete $portname
+                        return 0
             }
         } else {