commit 7a64a4b5a4914e682838c78772509dd719ff4c99
author dbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Sep 09 21:07:44 2010 +0000
committer dbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Sep 09 21:07:44 2010 +0000
tree 31ff301df52f8a3382dda96f634f5d4fe609ebcf
parent 574f0c594a2ee778afafaabdd0407f966d2e27eb

2010-09-09  Mihai Parparita  <mihaip@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

WebKitTools/Scripts/svn-apply

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 @@
     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)));