[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 9be46a77508f8abc8812376b6eeca6fedf979140
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 14 20:53:26 2002 +0000

    2002-03-14  Kenneth Kocienda  <kocienda at apple.com>
    
            Fix for this bug:
    
            Radar 2877924 ("/Users is not a directory" warning when /Users is a link to a directory)
    
            In addition, the URL file database is now much more "optimistic" about creating directories and files.
            The result should be a whole lot less chatter on fs_usage.
    
            * Database.subproj/IFURLFileDatabase.m: (-[IFURLFileDatabase setObject:forKey:]),
            (-[IFURLFileDatabase open]):
            * Misc.subproj/IFNSFileManagerExtensions.h:
            * Misc.subproj/IFNSFileManagerExtensions.m: (-[NSFileManager
            createFileAtPathWithIntermediateDirectories:contents:attributes:directoryAttribut
            es:]), (-[NSFileManager createIntermediateDirectoriesForPath:attributes:]),
            (-[NSFileManager fileExistsAtPath:isDirectory:traverseLink:]):
            * WebFoundation.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@739 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 3024fab..b2525e2 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -80,6 +80,7 @@ static NSNumber *IFURLFilePosixPermissions;
     NSDictionary *attributes;
     NSDictionary *directoryAttributes;
     NSArchiver *archiver;
+    NSFileManager *defaultManager;
 
     result = NO;
 
@@ -102,9 +103,13 @@ static NSNumber *IFURLFilePosixPermissions;
         NULL
     ];
 
-//        
     filePath = [NSString stringWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
-    result = [[NSFileManager defaultManager] createFileAtPathWithIntermediateDirectories:filePath contents:data attributes:attributes directoryAttributes:directoryAttributes];
+    
+    defaultManager = [NSFileManager defaultManager];
+    result = [defaultManager createFileAtPath:filePath contents:data attributes:attributes];
+    if (!result) {
+        result = [defaultManager createFileAtPathWithIntermediateDirectories:filePath contents:data attributes:attributes directoryAttributes:directoryAttributes];
+    }
 
     [archiver release];
 }
@@ -178,12 +183,21 @@ static NSNumber *IFURLFilePosixPermissions;
             }
         }
         else {
-            isOpen = [manager createDirectoryAtPathWithIntermediateDirectories:path attributes:[NSDictionary dictionaryWithObjectsAndKeys:
+            isOpen = [manager createDirectoryAtPath:path attributes:[NSDictionary dictionaryWithObjectsAndKeys:
                 [NSDate date], @"NSFileModificationDate",
                 NSUserName(), @"NSFileOwnerAccountName",
                 IFURLFileDirectoryPosixPermissions, @"NSFilePosixPermissions",
                 NULL
             ]];
+            
+            if (!isOpen) {
+                isOpen = [manager createDirectoryAtPathWithIntermediateDirectories:path attributes:[NSDictionary dictionaryWithObjectsAndKeys:
+                    [NSDate date], @"NSFileModificationDate",
+                    NSUserName(), @"NSFileOwnerAccountName",
+                    IFURLFileDirectoryPosixPermissions, @"NSFilePosixPermissions",
+                    NULL
+                ]];
+            }
         }
     }
     

-- 
WebKit Debian packaging