Blame SOURCES/patch-remove-empty-dir.patch

bf9b0b
diff -up patch-2.7.1/src/patch.c.remove-empty-dir patch-2.7.1/src/patch.c
bf9b0b
--- patch-2.7.1/src/patch.c.remove-empty-dir	2012-10-18 17:57:41.708586721 +0100
bf9b0b
+++ patch-2.7.1/src/patch.c	2013-03-11 11:35:54.607901400 +0000
bf9b0b
@@ -646,8 +646,8 @@ main (int argc, char **argv)
bf9b0b
     if (outstate.ofp && (ferror (outstate.ofp) || fclose (outstate.ofp) != 0))
bf9b0b
       write_fatal ();
bf9b0b
     output_files (NULL);
bf9b0b
-    delete_files ();
bf9b0b
     cleanup ();
bf9b0b
+    delete_files ();
bf9b0b
     if (somefailed)
bf9b0b
       exit (1);
bf9b0b
     return 0;
bf9b0b
diff -up patch-2.7.1/tests/Makefile.am.remove-empty-dir patch-2.7.1/tests/Makefile.am
bf9b0b
--- patch-2.7.1/tests/Makefile.am.remove-empty-dir	2012-09-14 10:15:22.000000000 +0100
bf9b0b
+++ patch-2.7.1/tests/Makefile.am	2013-03-11 11:35:54.619901466 +0000
bf9b0b
@@ -49,6 +49,7 @@ TESTS = \
bf9b0b
 	reject-format \
bf9b0b
 	remember-backup-files \
bf9b0b
 	remember-reject-files \
bf9b0b
+	remove-directories \
bf9b0b
 	symlinks \
bf9b0b
 	unmodified-files
bf9b0b
 
bf9b0b
diff -up patch-2.7.1/tests/remove-directories.remove-empty-dir patch-2.7.1/tests/remove-directories
bf9b0b
--- patch-2.7.1/tests/remove-directories.remove-empty-dir	2013-03-11 11:35:54.619901466 +0000
bf9b0b
+++ patch-2.7.1/tests/remove-directories	2013-03-11 11:35:54.619901466 +0000
bf9b0b
@@ -0,0 +1,29 @@
bf9b0b
+# Copyright (C) 2013 Free Software Foundation, Inc.
bf9b0b
+#
bf9b0b
+# Copying and distribution of this file, with or without modification,
bf9b0b
+# in any medium, are permitted without royalty provided the copyright
bf9b0b
+# notice and this notice are preserved.
bf9b0b
+
bf9b0b
+. $srcdir/test-lib.sh
bf9b0b
+
bf9b0b
+require_cat
bf9b0b
+use_local_patch
bf9b0b
+use_tmpdir
bf9b0b
+
bf9b0b
+# ==============================================================
bf9b0b
+# Remove empty parent diectories when removing a file
bf9b0b
+
bf9b0b
+mkdir dir
bf9b0b
+echo foobar > dir/file
bf9b0b
+cat > apatch <
bf9b0b
+--- dir/file
bf9b0b
++++ /dev/null
bf9b0b
+@@ -1 +0,0 @@
bf9b0b
+-foobar
bf9b0b
+EOF
bf9b0b
+
bf9b0b
+check 'patch -p0 -E < apatch' <
bf9b0b
+patching file dir/file
bf9b0b
+EOF
bf9b0b
+
bf9b0b
+ncheck '! test -e dir'