[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dbates at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 7a64a4b5a4914e682838c78772509dd719ff4c99
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 21:07:44 2010 +0000

    2010-09-09  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Daniel Bates.
    
            svn-apply tries to delete directories it shouldn't
            https://bugs.webkit.org/show_bug.cgi?id=45424
    
            isDirectoryEmptyForRemoval had the wrong check. If an item in the
            directory is itself a directory, then the directory is definitely
            not empty.
    
            * Scripts/svn-apply:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67115 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 262127e..f680eb2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-09  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Daniel Bates.
+
+        svn-apply tries to delete directories it shouldn't
+        https://bugs.webkit.org/show_bug.cgi?id=45424
+
+        isDirectoryEmptyForRemoval had the wrong check. If an item in the
+        directory is itself a directory, then the directory is definitely
+        not empty.
+
+        * Scripts/svn-apply:
+
 2010-09-09  Chris Fleizach  <cfleizach at apple.com>
 
         Fixing GTK and windows build failure.
diff --git a/WebKitTools/Scripts/svn-apply b/WebKitTools/Scripts/svn-apply
index 33b2279..1cf9c01 100755
--- a/WebKitTools/Scripts/svn-apply
+++ b/WebKitTools/Scripts/svn-apply
@@ -280,7 +280,7 @@ sub isDirectoryEmptyForRemoval($)
     opendir DIR, $dir or die "Could not open '$dir' to list files: $?";
     for (my $item = readdir DIR; $item && $directoryIsEmpty; $item = readdir DIR) {
         next if exists $removeDirectoryIgnoreList{$item};
-        if (! -d File::Spec->catdir($dir, $item)) {
+        if (-d File::Spec->catdir($dir, $item)) {
             $directoryIsEmpty = 0;
         } else {
             next if (scmWillDeleteFile(File::Spec->catdir($dir, $item)));

-- 
WebKit Debian packaging