[138597] branches/gsoc15-pallet

[ksammons at macports.org]

Revision: 138597
          https://trac.macports.org/changeset/138597
Author:   ksammons at macports.org
Date:     2015-07-13 11:43:17 -0700 (Mon, 13 Jul 2015)
Log Message:
-----------
Got uninstallation working.

Modified Paths:
--------------
    branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m
    branches/gsoc15-pallet/MacPorts_Framework/MPPort.m
    branches/gsoc15-pallet/MacPorts_Framework/portProcessInit.tcl
    branches/gsoc15-pallet/Pallet/MPActionsController.m
    branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate

Modified: branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m
===================================================================
--- branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m	2015-07-13 15:35:39 UTC (rev 138596)
+++ branches/gsoc15-pallet/MacPorts_Framework/MPMacPorts.m	2015-07-13 18:43:17 UTC (rev 138597)
@@ -176,8 +176,10 @@
         result = [interpreter evaluateStringWithPossiblePrivileges:@"mportdiagnose" error:sError];
     }*/
     
-    result = [interpreter evaluateStringAsString:@"diagnose::main \"--quiet\"" error:sError];
+    result = [interpreter evaluateStringAsString:@"set foo diagnose::main \"--quiet\"; return $foo" error:sError];
     
+    NSLog(@"RESULT: %@", result);
+    
     [[MPNotifications sharedListener] setPerformingTclCommand:@""];
     [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"MacPorts_diagnose_Finished" object:nil];
     

Modified: branches/gsoc15-pallet/MacPorts_Framework/MPPort.m
===================================================================
--- branches/gsoc15-pallet/MacPorts_Framework/MPPort.m	2015-07-13 15:35:39 UTC (rev 138596)
+++ branches/gsoc15-pallet/MacPorts_Framework/MPPort.m	2015-07-13 18:43:17 UTC (rev 138597)
@@ -343,7 +343,13 @@
 			sparams = [sparams stringByAppendingString:@" "];
 		}
 	}
+    
+    NSLog(@"Interpreter string: %@", [NSString stringWithFormat:@"[%@ %@]", procedure,sparams]);
 	
+    [interpreter evaluateStringAsString:[NSString stringWithFormat:@"[%@ %@]" , procedure, sparams]
+                                          error:execError];
+    
+    /*
 	if( [parentMacPortsInstance authorizationMode] ) {
 		[interpreter evaluateStringWithMPHelperTool:[NSString stringWithFormat:@"[%@ %@]" , procedure, sparams] 
 									  error:execError];
@@ -351,7 +357,7 @@
 	else {
 		[interpreter evaluateStringAsString:[NSString stringWithFormat:@"[%@ %@]" , procedure, sparams] 
 									  error:execError];
-	}
+	}*/
 	
 	
 }

Modified: branches/gsoc15-pallet/MacPorts_Framework/portProcessInit.tcl
===================================================================
--- branches/gsoc15-pallet/MacPorts_Framework/portProcessInit.tcl	2015-07-13 15:35:39 UTC (rev 138596)
+++ branches/gsoc15-pallet/MacPorts_Framework/portProcessInit.tcl	2015-07-13 18:43:17 UTC (rev 138597)
@@ -50,8 +50,7 @@
 	}
 }
 proc mportuninstall_composite {portname {v ""} {optionslist ""} } {
-    puts "Moo"
-    exit
+    puts "I am here, hear me moo"
 	if {[catch {registry_uninstall::uninstall_composite $portname $v [array get options]} result]} {
 		
 			global errorInfo

Modified: branches/gsoc15-pallet/Pallet/MPActionsController.m
===================================================================
--- branches/gsoc15-pallet/Pallet/MPActionsController.m	2015-07-13 15:35:39 UTC (rev 138596)
+++ branches/gsoc15-pallet/Pallet/MPActionsController.m	2015-07-13 18:43:17 UTC (rev 138597)
@@ -368,7 +368,6 @@
 	NSUInteger index;
 	index = [queueArray count]-1;
 	NSLog(@"Array Size is: %lu", (unsigned long)index);
-	NSUInteger i;
 	[queue setSelectionIndex: 0];
 	queueCounter=0;
 	
@@ -456,7 +455,7 @@
 		//If we are done, we remove ourselves as an observer from the Notification Center, and we notify the user
 		[[NSNotificationCenter defaultCenter] removeObserver:self name:@"advanceQ" object:nil];
 		
-		int allops=GROWL_ALLOPS;
+		//int allops=GROWL_ALLOPS;
         //FIXME
 		//[[MPActionLauncher sharedInstance]
 		 //performSelectorInBackground:@selector(sendGrowlNotification:) withObject:(id) allops];

Modified: branches/gsoc15-pallet/Pallet/Pallet.xcodeproj/project.xcworkspace/xcuserdata/mrappleseed.xcuserdatad/UserInterfaceState.xcuserstate
===================================================================
(Binary files differ)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150713/4043ab4c/attachment-0001.html>