[39375] branches/gsoc08-framework/MacPorts_Framework_Release

[armahg at macports.org]

Revision: 39375
          http://trac.macosforge.org/projects/macports/changeset/39375
Author:   armahg at macports.org
Date:     2008-08-18 22:28:21 -0700 (Mon, 18 Aug 2008)
Log Message:
-----------
Applied mportactivate, mportuninstall and mportdeactivate method fixes to both init.tcl and interpInit.tcl fiies

Modified Paths:
--------------
    branches/gsoc08-framework/MacPorts_Framework_Release/init.tcl
    branches/gsoc08-framework/MacPorts_Framework_Release/interpInit.tcl

Modified: branches/gsoc08-framework/MacPorts_Framework_Release/init.tcl
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework_Release/init.tcl	2008-08-19 05:24:31 UTC (rev 39374)
+++ branches/gsoc08-framework/MacPorts_Framework_Release/init.tcl	2008-08-19 05:28:21 UTC (rev 39375)
@@ -149,9 +149,9 @@
 
 #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 {portuninstall::uninstall $portname $v $optionslist} result]} {
+#in macports.tcl. Note optionslist is not being used for now
+proc mportuninstall {portname {v ""} {optionslist ""} } {
+	if {[catch {portuninstall::uninstall $portname $v [array get options]} result]} {
 		
 			global errorInfo
 			ui_debug "$errorInfo"
@@ -160,8 +160,8 @@
 	}
 }
 
-proc mportactivate {portname v optionslist} {
-	if {[catch {portimage::activate $portname $v $optionslist} result]} {
+proc mportactivate {portname {v ""} {optionslist ""}} {
+	if {[catch {portimage::activate $portname $v [array get options]} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
@@ -170,8 +170,8 @@
 	}
 }
 
-proc mportdeactivate {portname v optionslist} {
-	if {[catch {portimage::deactivate $portname $v $optionslist} result]} {
+proc mportdeactivate {portname {v ""} {optionslist ""} } {
+	if {[catch {portimage::deactivate $portname $v [array get options]} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"

Modified: branches/gsoc08-framework/MacPorts_Framework_Release/interpInit.tcl
===================================================================
--- branches/gsoc08-framework/MacPorts_Framework_Release/interpInit.tcl	2008-08-19 05:24:31 UTC (rev 39374)
+++ branches/gsoc08-framework/MacPorts_Framework_Release/interpInit.tcl	2008-08-19 05:28:21 UTC (rev 39375)
@@ -153,7 +153,6 @@
 #Wrapping the following API routines to catch errors
 #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 {portuninstall::uninstall $portname $v [array get options]} result]} {
 		
@@ -165,7 +164,7 @@
 }
 
 proc mportactivate {portname {v ""} {optionslist ""}} {
-	if {[catch {portimage::activate $portname $v $optionslist} result]} {
+	if {[catch {portimage::activate $portname $v [array get options]} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
@@ -175,7 +174,7 @@
 }
 
 proc mportdeactivate {portname {v ""} {optionslist ""} } {
-	if {[catch {portimage::deactivate $portname $v $optionslist} result]} {
+	if {[catch {portimage::deactivate $portname $v [array get options]} result]} {
 			
 			global errorInfo
 			ui_debug "$errorInfo"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080818/af3b1926/attachment-0001.html