[30241] users/rhwood/MacPorts.Framework/MPRegistery.m

source_changes at macosforge.org source_changes at macosforge.org
Mon Oct 22 18:59:14 PDT 2007


Revision: 30241
          http://trac.macosforge.org/projects/macports/changeset/30241
Author:   rhwood at macports.org
Date:     2007-10-22 18:59:14 -0700 (Mon, 22 Oct 2007)

Log Message:
-----------
Handle ports that are not installed or do not exist without crashing

Modified Paths:
--------------
    users/rhwood/MacPorts.Framework/MPRegistery.m

Modified: users/rhwood/MacPorts.Framework/MPRegistery.m
===================================================================
--- users/rhwood/MacPorts.Framework/MPRegistery.m	2007-10-23 01:57:29 UTC (rev 30240)
+++ users/rhwood/MacPorts.Framework/MPRegistery.m	2007-10-23 01:59:14 UTC (rev 30241)
@@ -110,13 +110,15 @@
 	rawEnumerator = [raw objectEnumerator];
 	while (item = [rawEnumerator nextObject]) {
 		versions = [interpreter arrayFromTclListAsString:item];
-		properties = [NSDictionary dictionaryWithObjects:
-			[versions objectsAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(1,[versions count] - 1)]] 
-												 forKeys:[NSArray arrayWithObjects:@"version", @"revision", @"variants", @"active", @"whatIsThis", nil]];
-		if ([result objectForKey:[versions objectAtIndex:0]]) {
-			[result setObject:[[result objectForKey:[versions objectAtIndex:0]] arrayByAddingObject:properties] forKey:[versions objectAtIndex:0]];
-		} else {
-			[result setObject:[NSArray arrayWithObject:properties] forKey:[versions objectAtIndex:0]];
+		if ([versions count] == 6) {
+			properties = [NSDictionary dictionaryWithObjects:
+				[versions objectsAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(1,[versions count] - 1)]] 
+													 forKeys:[NSArray arrayWithObjects:@"version", @"revision", @"variants", @"active", @"whatIsThis", nil]];
+			if ([result objectForKey:[versions objectAtIndex:0]]) {
+				[result setObject:[[result objectForKey:[versions objectAtIndex:0]] arrayByAddingObject:properties] forKey:[versions objectAtIndex:0]];
+			} else {
+				[result setObject:[NSArray arrayWithObject:properties] forKey:[versions objectAtIndex:0]];
+			}
 		}
 	}
 	return result;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071022/633281a9/attachment.html


More information about the macports-changes mailing list