[138417] branches/gsoc15-pallet/MacPorts_Framework

[ksammons at macports.org]

Revision: 138417
          https://trac.macports.org/changeset/138417
Author:   ksammons at macports.org
Date:     2015-07-07 11:52:58 -0700 (Tue, 07 Jul 2015)
Log Message:
-----------
Pallet branch: Other files needed for installation

Modified Paths:
--------------
    branches/gsoc15-pallet/MacPorts_Framework/MPPort.m
    branches/gsoc15-pallet/MacPorts_Framework/MPPortProcess.m

Modified: branches/gsoc15-pallet/MacPorts_Framework/MPPort.m
===================================================================
--- branches/gsoc15-pallet/MacPorts_Framework/MPPort.m	2015-07-07 18:50:58 UTC (rev 138416)
+++ branches/gsoc15-pallet/MacPorts_Framework/MPPort.m	2015-07-07 18:52:58 UTC (rev 138417)
@@ -310,7 +310,7 @@
 									  @"set portHandle [mportopen  %@  %@  %@]; mportexec  $portHandle %@; mportclose $portHandle", 
 									  [self valueForKey:@"porturl"], opts, vrnts, target]);
 
-    NSString * test = [interpreter evaluateStringWithPossiblePrivileges:[NSString stringWithFormat:@"exit; set foo [mportopen  %@  %@  %@]; puts $foo; test", [self valueForKey:@"porturl"], opts, vrnts] error:execError];
+    NSString * test = [interpreter evaluateStringAsString:[NSString stringWithFormat:@"set portHandle [mportopen  %@  %@  %@]; mportexec  $portHandle %@; mportclose $portHandle", [self valueForKey:@"porturl"], opts, vrnts] error:execError];
     NSLog(@"Pills: %@", test);
 	
 	[self setState:MPPortStateLearnState];
@@ -324,7 +324,7 @@
 - (void)execPortProc:(NSString *)procedure withParams:(NSArray *)params error:(NSError **)execError {
 	
 	//params can contain either NSStrings or NSArrays
-	NSString * sparams = [NSString stringWithString:@" "];
+	NSString * sparams = @" ";
 	NSEnumerator * penums = [params objectEnumerator];
 	MPInterpreter *interpreter = [MPInterpreter sharedInterpreter];
 	

Modified: branches/gsoc15-pallet/MacPorts_Framework/MPPortProcess.m
===================================================================
--- branches/gsoc15-pallet/MacPorts_Framework/MPPortProcess.m	2015-07-07 18:50:58 UTC (rev 138416)
+++ branches/gsoc15-pallet/MacPorts_Framework/MPPortProcess.m	2015-07-07 18:52:58 UTC (rev 138417)
@@ -55,12 +55,13 @@
 		Tcl_DeleteInterp(interpreter);
 	}
     // Load macports_fastload.tcl from PKGPath/macports1.0
+    /*
     NSString * mport_fastload = [[@"source [file join \"" stringByAppendingString:PKGPath]
 								 stringByAppendingString:@"\" macports1.0 macports_fastload.tcl]"];
 	if(Tcl_Eval(interpreter, [mport_fastload UTF8String]) == TCL_ERROR) {
 		NSLog(@"Error in Tcl_EvalFile macports_fastload.tcl: %s", Tcl_GetStringResult(interpreter));
 		Tcl_DeleteInterp(interpreter);
-	}
+	}*/
     // Load notifications methods
     Tcl_CreateObjCommand(interpreter, "simplelog", SimpleLog_Command, NULL, NULL);
 	if (Tcl_PkgProvide(interpreter, "simplelog", "1.0") != TCL_OK) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150707/98ac1daa/attachment.html>