[50193] trunk/base/src

jmr at macports.org jmr at macports.org
Mon Apr 27 08:42:22 PDT 2009


Revision: 50193
          http://trac.macports.org/changeset/50193
Author:   jmr at macports.org
Date:     2009-04-27 08:42:21 -0700 (Mon, 27 Apr 2009)
Log Message:
-----------
switch from mportsearch to mportlookup in package1.0 and port1.0

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/package1.0/portarchive.tcl
    trunk/base/src/package1.0/portdpkg.tcl
    trunk/base/src/package1.0/portmpkg.tcl
    trunk/base/src/package1.0/portrpm.tcl
    trunk/base/src/package1.0/portsrpm.tcl
    trunk/base/src/port1.0/portlint.tcl
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2009-04-27 14:53:26 UTC (rev 50192)
+++ trunk/base/src/macports1.0/macports.tcl	2009-04-27 15:42:21 UTC (rev 50193)
@@ -792,6 +792,7 @@
     $workername alias mport_open mportopen
     $workername alias mport_close mportclose
     $workername alias mport_search mportsearch
+    $workername alias mport_lookup mportlookup
 
     # instantiate the UI call-backs
     foreach priority ${macports::ui_priorities} {

Modified: trunk/base/src/package1.0/portarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portarchive.tcl	2009-04-27 14:53:26 UTC (rev 50192)
+++ trunk/base/src/package1.0/portarchive.tcl	2009-04-27 15:42:21 UTC (rev 50193)
@@ -407,7 +407,7 @@
                 puts $sd "</item>"
             puts $sd "</provides>"
             
-    set res [mport_search ^$portname\$]
+    set res [mport_lookup $portname]
     if {[llength $res] < 2} {
         ui_error "Dependency $portname not found"
     } else {

Modified: trunk/base/src/package1.0/portdpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portdpkg.tcl	2009-04-27 14:53:26 UTC (rev 50192)
+++ trunk/base/src/package1.0/portdpkg.tcl	2009-04-27 15:42:21 UTC (rev 50193)
@@ -161,10 +161,10 @@
 
 proc portdpkg::make_dependency_list {portname} {
 	set result {}
-	if {[catch {set res [mport_search "^$portname\$"]} error]} {
+	if {[catch {set res [mport_lookup $portname]} error]} {
 		global errorInfo
 		ui_debug "$errorInfo"
-		ui_error "port search failed: $error"
+		ui_error "port lookup failed: $error"
 		return 1
 	}
 	foreach {name array} $res {

Modified: trunk/base/src/package1.0/portmpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portmpkg.tcl	2009-04-27 14:53:26 UTC (rev 50192)
+++ trunk/base/src/package1.0/portmpkg.tcl	2009-04-27 15:42:21 UTC (rev 50193)
@@ -57,7 +57,7 @@
 
 proc portmpkg::make_dependency_list {portname} {
 	set result {}
-	if {[catch {set res [mport_search "^$portname\$"]} error]} {
+	if {[catch {set res [mport_lookup $portname]} error]} {
 		global errorInfo
 		ui_debug "$errorInfo"
 		ui_error "port search failed: $error"
@@ -91,7 +91,7 @@
 
 proc portmpkg::make_one_package {portname portversion destination} {
 	global prefix package.destpath package.flat
-	if {[catch {set res [mport_search "^$portname\$"]} result]} {
+	if {[catch {set res [mport_lookup $portname]} result]} {
 		global errorInfo
 		ui_debug "$errorInfo"
 		ui_error "port search failed: $result"

Modified: trunk/base/src/package1.0/portrpm.tcl
===================================================================
--- trunk/base/src/package1.0/portrpm.tcl	2009-04-27 14:53:26 UTC (rev 50192)
+++ trunk/base/src/package1.0/portrpm.tcl	2009-04-27 15:42:21 UTC (rev 50193)
@@ -129,10 +129,10 @@
 
 proc portrpm::make_dependency_list {portname} {
     set result {}
-    if {[catch {set res [mport_search "^$portname\$"]} error]} {
+    if {[catch {set res [mport_lookup $portname]} error]} {
 		global errorInfo
 		ui_debug "$errorInfo"
-        ui_error "port search failed: $error"
+        ui_error "port lookup failed: $error"
         return 1
     }
     foreach {name array} $res {

Modified: trunk/base/src/package1.0/portsrpm.tcl
===================================================================
--- trunk/base/src/package1.0/portsrpm.tcl	2009-04-27 14:53:26 UTC (rev 50192)
+++ trunk/base/src/package1.0/portsrpm.tcl	2009-04-27 15:42:21 UTC (rev 50193)
@@ -126,10 +126,10 @@
 
 proc portsrpm::make_dependency_list {portname} {
     set result {}
-    if {[catch {set res [mport_search "^$portname\$"]} error]} {
+    if {[catch {set res [mport_lookup $portname]} error]} {
 		global errorInfo
 		ui_debug "$errorInfo"
-        ui_error "port search failed: $error"
+        ui_error "port lookup failed: $error"
         return 1
     }
     foreach {name array} $res {

Modified: trunk/base/src/port1.0/portlint.tcl
===================================================================
--- trunk/base/src/port1.0/portlint.tcl	2009-04-27 14:53:26 UTC (rev 50192)
+++ trunk/base/src/port1.0/portlint.tcl	2009-04-27 15:42:21 UTC (rev 50193)
@@ -421,7 +421,7 @@
     if {[info exists depends_run]} { eval "lappend all_depends $depends_run" }
     foreach depspec $all_depends {
         set dep [lindex [split $depspec :] end]
-        if {[catch {set res [mport_search "^$dep\$"]} error]} {
+        if {[catch {set res [mport_lookup $dep]} error]} {
             global errorInfo
             ui_debug "$errorInfo"
             continue

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2009-04-27 14:53:26 UTC (rev 50192)
+++ trunk/base/src/port1.0/portutil.tcl	2009-04-27 15:42:21 UTC (rev 50193)
@@ -1425,7 +1425,7 @@
 # recursive dependency search for portname
 proc recursive_collect_deps {portname deptypes {depsfound {}}} \
 {
-    set res [mport_search ^$portname\$]
+    set res [mport_lookup $portname]
     if {[llength $res] < 2} \
     {
         return {}
@@ -2071,10 +2071,8 @@
     } else {
         set options(workpath) ${newworkpath}
     }
-    # Escape regex special characters
-    regsub -all "(\\(){1}|(\\)){1}|(\\{1}){1}|(\\+){1}|(\\{1}){1}|(\\{){1}|(\\}){1}|(\\^){1}|(\\$){1}|(\\.){1}|(\\\\){1}" $portname "\\\\&" search_string 
     
-    set res [mport_search ^$search_string\$]
+    set res [mport_lookup $portname]
     if {[llength $res] < 2} {
         ui_error "Dependency $portname not found"
         return -1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090427/3004685b/attachment.html>


More information about the macports-changes mailing list