[79172] contrib/MacPorts_Framework

[jmr at macports.org]

Revision: 79172
          http://trac.macports.org/changeset/79172
Author:   jmr at macports.org
Date:     2011-06-03 22:49:29 -0700 (Fri, 03 Jun 2011)
Log Message:
-----------
MacPorts_Framework: adapt to registry changes

Modified Paths:
--------------
    contrib/MacPorts_Framework/MPPort.m
    contrib/MacPorts_Framework/init.tcl
    contrib/MacPorts_Framework/interpInit.tcl
    contrib/MacPorts_Framework/portProcessInit.tcl

Modified: contrib/MacPorts_Framework/MPPort.m
===================================================================
--- contrib/MacPorts_Framework/MPPort.m	2011-06-04 05:18:44 UTC (rev 79171)
+++ contrib/MacPorts_Framework/MPPort.m	2011-06-04 05:49:29 UTC (rev 79172)
@@ -355,33 +355,37 @@
 }
 
 
+/* XXX  uninstallWithVersion, activateWithVersion, deactivateWithVersion all need
+   to accept separate version,revision,variants args rather than a (possibly ambiguous)
+   composite version spec */
+
 #pragma mark -
-# pragma mark Exec methods 
+# pragma mark Exec methods
 - (void)uninstallWithVersion:(NSString *)version error:(NSError **)mError {
 	if (version == nil) {
-		[self execPortProc:@"mportuninstall" withOptions:nil version:@"" error:mError];
+		[self execPortProc:@"mportuninstall_composite" withOptions:nil version:@"" error:mError];
 	}
 	else {
-		[self execPortProc:@"mportuninstall" withOptions:nil version:version error:mError];
+		[self execPortProc:@"mportuninstall_composite" withOptions:nil version:version error:mError];
 	}
 }
 
 - (void)activateWithVersion:(NSString *)version error:(NSError **)mError {
 	if (version == nil) {
-		[self execPortProc:@"mportactivate" withOptions:nil version:@"" error:mError];
+		[self execPortProc:@"mportactivate_composite" withOptions:nil version:@"" error:mError];
 	}
 	else {
-		[self execPortProc:@"mportactivate" withOptions:nil version:version error:mError];
+		[self execPortProc:@"mportactivate_composite" withOptions:nil version:version error:mError];
 	}
 		
 }
 
 - (void)deactivateWithVersion:(NSString *)version error:(NSError **)mError {
 	if (version == nil) {
-		[self execPortProc:@"mportdeactivate" withOptions:nil version:@"" error:mError];
+		[self execPortProc:@"mportdeactivate_composite" withOptions:nil version:@"" error:mError];
 	}
 	else {
-		[self execPortProc:@"mportdeactivate" withOptions:nil version:version error:mError];
+		[self execPortProc:@"mportdeactivate_composite" withOptions:nil version:version error:mError];
 	}
 }
 

Modified: contrib/MacPorts_Framework/init.tcl
===================================================================
--- contrib/MacPorts_Framework/init.tcl	2011-06-04 05:18:44 UTC (rev 79171)
+++ contrib/MacPorts_Framework/init.tcl	2011-06-04 05:49:29 UTC (rev 79172)
@@ -37,31 +37,58 @@
 #Wrapping the following API routines to catch errors
 #and log error Information in a similar fashion to code
 #in macports.tcl.
-proc mportuninstall {portname {v ""} {optionslist ""}} {
-	if {[catch {registry_uninstall::uninstall $portname $v $optionslist} result]} {
+proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""}} {
+	if {[catch {registry_uninstall::uninstall $portname $version $revision $variants $optionslist} result]} {
 		
 			global errorInfo
 			ui_debug "$errorInfo"
+			ui_error "Uninstall $portname ${version}_${revision}${variants} failed: $result"
+			return 1
+	}
+}
+proc mportuninstall_composite {portname {v ""} {optionslist ""}} {
+	if {[catch {registry_uninstall::uninstall_composite $portname $v $optionslist} result]} {
+		
+			global errorInfo
+			ui_debug "$errorInfo"
 			ui_error "Uninstall $portname $v failed: $result"
 			return 1
 	}
 }
 
-proc mportactivate {portname v optionslist} {
-	if {[catch {portimage::activate $portname $v $optionslist} result]} {
+proc mportactivate {portname {version ""} {revision ""} {variants 0} {optionslist ""}} {
+	if {[catch {portimage::activate $portname $version $revision $variants $optionslist} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
+			ui_error "Activate $portname ${version}_${revision}${variants} failed: $result"
+			return 1
+	}
+}
+proc mportactivate_composite {portname {v ""} {optionslist ""}} {
+	if {[catch {portimage::activate_composite $portname $v $optionslist} result]} {
+			
+			global errorInfo
+			ui_debug "$errorInfo"
 			ui_error "Activate $portname $v failed: $result"
 			return 1
 	}
 }
 
-proc mportdeactivate {portname v optionslist} {
-	if {[catch {portimage::deactivate $portname $v $optionslist} result]} {
+proc mportdeactivate {portname {version ""} {revision ""} {variants 0} {optionslist ""}} {
+	if {[catch {portimage::deactivate $portname $version $revision $variants $optionslist} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
+			ui_error "Deactivate $portname ${version}_${revision}${variants} failed: $result"
+			return 1
+	}
+}
+proc mportdeactivate_composite {portname {v ""} {optionslist ""}} {
+	if {[catch {portimage::deactivate_composite $portname $v $optionslist} result]} {
+			
+			global errorInfo
+			ui_debug "$errorInfo"
 			ui_error "Deactivate $portname $v failed: $result"
 			return 1
 	}

Modified: contrib/MacPorts_Framework/interpInit.tcl
===================================================================
--- contrib/MacPorts_Framework/interpInit.tcl	2011-06-04 05:18:44 UTC (rev 79171)
+++ contrib/MacPorts_Framework/interpInit.tcl	2011-06-04 05:49:29 UTC (rev 79172)
@@ -38,31 +38,58 @@
 #and log error Information in a similar fashion to code
 #in macports.tcl. Note optionslist is not being used for now
 set mp_empty_list [list]
-proc mportuninstall {portname {v ""} {optionslist ""} } {
-	if {[catch {registry_uninstall::uninstall $portname $v [array get options]} result]} {
+proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""} } {
+	if {[catch {registry_uninstall::uninstall $portname $version $revision $variants [array get options]} result]} {
 		
 			global errorInfo
 			ui_debug "$errorInfo"
+			ui_error "Uninstall $portname ${version}_${revision}${variants} failed: $result"
+			return 1
+	}
+}
+proc mportuninstall_composite {portname {v ""} {optionslist ""} } {
+	if {[catch {registry_uninstall::uninstall_composite $portname $v [array get options]} result]} {
+		
+			global errorInfo
+			ui_debug "$errorInfo"
 			ui_error "Uninstall $portname $v failed: $result"
 			return 1
 	}
 }
 
-proc mportactivate {portname {v ""} {optionslist ""}} {
-	if {[catch {portimage::activate $portname $v $optionslist} result]} {
+proc mportactivate {portname {version ""} {revision ""} {variants 0} {optionslist ""}} {
+	if {[catch {portimage::activate $portname $version $revision $variants $optionslist} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
+			ui_error "Activate $portname ${version}_${revision}${variants} failed: $result"
+			return 1
+	}
+}
+proc mportactivate_composite {portname {v ""} {optionslist ""}} {
+	if {[catch {portimage::activate_composite $portname $v $optionslist} result]} {
+			
+			global errorInfo
+			ui_debug "$errorInfo"
 			ui_error "Activate $portname $v failed: $result"
 			return 1
 	}
 }
 
-proc mportdeactivate {portname {v ""} {optionslist ""} } {
-	if {[catch {portimage::deactivate $portname $v $optionslist} result]} {
+proc mportdeactivate {portname {version ""} {revision ""} {variants 0} {optionslist ""} } {
+	if {[catch {portimage::deactivate $portname $version $revision $variants $optionslist} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
+			ui_error "Deactivate $portname ${version}_${revision}${variants} failed: $result"
+			return 1
+	}
+}
+proc mportdeactivate_composite {portname {v ""} {optionslist ""} } {
+	if {[catch {portimage::deactivate_composite $portname $v $optionslist} result]} {
+			
+			global errorInfo
+			ui_debug "$errorInfo"
 			ui_error "Deactivate $portname $v failed: $result"
 			return 1
 	}
@@ -86,4 +113,4 @@
 	global errorInfo
 	puts "$errorInfo"
 	fatal "Failed to initialize ports system, $result"
-}
\ No newline at end of file
+}

Modified: contrib/MacPorts_Framework/portProcessInit.tcl
===================================================================
--- contrib/MacPorts_Framework/portProcessInit.tcl	2011-06-04 05:18:44 UTC (rev 79171)
+++ contrib/MacPorts_Framework/portProcessInit.tcl	2011-06-04 05:49:29 UTC (rev 79172)
@@ -38,31 +38,58 @@
 #and log error Information in a similar fashion to code
 #in macports.tcl. Note optionslist is not being used for now
 set mp_empty_list [list]
-proc mportuninstall {portname {v ""} {optionslist ""} } {
-	if {[catch {registry_uninstall::uninstall $portname $v [array get options]} result]} {
+proc mportuninstall {portname {version ""} {revision ""} {variants 0} {optionslist ""} } {
+	if {[catch {registry_uninstall::uninstall $portname $version $revision $variants [array get options]} result]} {
 		
 			global errorInfo
 			ui_debug "$errorInfo"
+			ui_error "Uninstall $portname ${version}_${revision}${variants} failed: $result"
+			return 1
+	}
+}
+proc mportuninstall_composite {portname {v ""} {optionslist ""} } {
+	if {[catch {registry_uninstall::uninstall_composite $portname $v [array get options]} result]} {
+		
+			global errorInfo
+			ui_debug "$errorInfo"
 			ui_error "Uninstall $portname $v failed: $result"
 			return 1
 	}
 }
 
-proc mportactivate {portname {v ""} {optionslist ""}} {
-	if {[catch {portimage::activate $portname $v $optionslist} result]} {
+proc mportactivate {portname {version ""} {revision ""} {variants 0} {optionslist ""}} {
+	if {[catch {portimage::activate $portname $version $revision $variants $optionslist} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
+			ui_error "Activate $portname ${version}_${revision}${variants} failed: $result"
+			return 1
+	}
+}
+proc mportactivate_composite {portname {v ""} {optionslist ""}} {
+	if {[catch {portimage::activate_composite $portname $v $optionslist} result]} {
+			
+			global errorInfo
+			ui_debug "$errorInfo"
 			ui_error "Activate $portname $v failed: $result"
 			return 1
 	}
 }
 
-proc mportdeactivate {portname {v ""} {optionslist ""} } {
-	if {[catch {portimage::deactivate $portname $v $optionslist} result]} {
+proc mportdeactivate {portname {version ""} {revision ""} {variants 0} {optionslist ""} } {
+	if {[catch {portimage::deactivate $portname $version $revision $variants $optionslist} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
+			ui_error "Deactivate $portname ${version}_${revision}${variants} failed: $result"
+			return 1
+	}
+}
+proc mportdeactivate_composite {portname {v ""} {optionslist ""} } {
+	if {[catch {portimage::deactivate_composite $portname $v $optionslist} result]} {
+			
+			global errorInfo
+			ui_debug "$errorInfo"
 			ui_error "Deactivate $portname $v failed: $result"
 			return 1
 	}
@@ -86,4 +113,4 @@
 	global errorInfo
 	puts "$errorInfo"
 	fatal "Failed to initialize ports system, $result"
-}
\ No newline at end of file
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110603/cf35306b/attachment-0001.html>