Permalink
Browse files

Resolved merge

  • Loading branch information...
2 parents 5457476 + 5dce90e commit d092ae9295cfdafd7bc22d6bf65c83de0ee43bbe @andymatuschak andymatuschak committed Oct 28, 2011
Showing with 7 additions and 5 deletions.
  1. +5 −3 SUDiskImageUnarchiver.m
  2. +2 −2 SUPlainInstallerInternals.m
View
@@ -76,10 +76,12 @@ - (void)extractDMG
goto reportError;
}
- for (NSString *fileItem in contents)
+ NSEnumerator *contentsEnumerator = [contents objectEnumerator];
+ NSString *item;
+ while ((item = [contentsEnumerator nextObject]))
{
- NSString *fromPath = [mountPoint stringByAppendingPathComponent:fileItem];
- NSString *toPath = [[archivePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:fileItem];
+ NSString *fromPath = [mountPoint stringByAppendingPathComponent:item];
+ NSString *toPath = [[archivePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:item];
SULog(@"copyItemAtPath:%@ toPath:%@", fromPath, toPath);
@@ -464,7 +464,7 @@ + (BOOL)copyPathWithAuthentication:(NSString *)src overPath:(NSString *)dst temp
{
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5)
{
- NSFileManager *manager = [[NSFileManager alloc] init];
+ NSFileManager *manager = [[[NSFileManager alloc] init] autorelease];
BOOL success = [manager moveItemAtPath:dst toPath:tmpPath error:error];
if (!success && hadFileAtDest)
{
@@ -489,7 +489,7 @@ + (BOOL)copyPathWithAuthentication:(NSString *)src overPath:(NSString *)dst temp
{
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5)
{
- NSFileManager *manager = [[NSFileManager alloc] init];
+ NSFileManager *manager = [[[NSFileManager alloc] init] autorelease];
BOOL success = [manager copyItemAtPath:src toPath:dst error:error];
if (!success)
{

0 comments on commit d092ae9

Please sign in to comment.