Changeset 1226 for trunk/base

Timestamp:

Nov 11, 2002, 9:11:24 AM (21 years ago)

Author:

kevin

Message:

Deprecate dportmatch in favor of dportsearch.

Location:

trunk/base/src

Files:

• darwinports1.0/darwinports.tcl (modified) (2 diffs)
• port/port.tcl (modified) (1 diff)
• port1.0/portutil.tcl (modified) (1 diff)

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

@@ -311 +311 @@
                 array set portinfo $line
                 if [info exists portinfo(portarchive)] {
-                    set portinfo(porturl) ${source}/$portinfo(portarchive)
+                    lappend line porturl ${source}/$portinfo(portarchive)
                 } elseif [info exists portinfo(portdir)] {
-                    set portinfo(porturl) ${source}/$portinfo(portdir)
+                    lappend line porturl ${source}/$portinfo(portdir)
                 }
                 lappend matches $name
@@ -332 +332 @@
 
 proc dportmatch {regexp} {
-    global darwinports::portdbpath darwinports::sources
-    foreach source $sources {
-        if {[catch {set fd [open [darwinports::getindex $source] r]} result]} {
-            return -code error "Can't open index file for source $source. Have you synced your source indexes?"
-        }
-        while {[gets $fd line] >= 0} {
-            set name [lindex $line 0]
-            if {[regexp -- $regexp $name] == 1} {
-                gets $fd line
-                array set portinfo $line
-                if [info exists portinfo(portarchive)] {
-                    set portinfo(porturl) ${source}/$portinfo(portarchive)
-                } elseif [info exists portinfo(portdir)] {
-                    set portinfo(porturl) ${source}/$portinfo(portdir)
-                }
-                close $fd
-                return [array get portinfo]
-            } else {
-                set len [lindex $line 1]
-                seek $fd $len current
-            }
-        }
-        close $fd
-    }
+        return -code error "dportmatch has been deprecated, use dportsearch instead."
 }
 

trunk/base/src/port/port.tcl

@@ -153 +153 @@
         set target $action
         if {[info exists portname]} {
-            if {[catch {array set portinfo [dportmatch ^$portname\$]} result]} {
+            if {[catch {set res [dportsearch ^$portname\$]} result]} {
                 puts $result
                 exit 1
             }
-            if {[array size portinfo] == 0} {
+            if {[llength $res] < 2} {
                 puts "Port $portname not found"
                 exit 1
             }
+            array set portinfo [lindex $res 1]
             set porturl $portinfo(porturl)
         }

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

@@ -1077 +1077 @@
     array set options [list]
     array set variations [list]
-    array set portinfo [dportmatch ^$portname\$]
-    if {[array size portinfo] == 0} {
+    set res [dportsearch ^$portname\$]
+    if {[llength $res] < 2} {
         ui_error "Dependency $portname not found"
         return -1
     }
+        array set portinfo [lindex $res 1]
     set porturl $portinfo(porturl)