[gentoo-commits] gentoo-x86 commit in sys-devel/patch/files: patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch patch-2.7.1-Fix-removing-empty-directories.patch patch-2.7.1-Fix-removing-empty-directories-automake.patch

[Doug Goldstein (cardoe)]

cardoe      13/08/02 13:25:34

  Added:               
                        patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch
                        patch-2.7.1-Fix-removing-empty-directories.patch
                        patch-2.7.1-Fix-removing-empty-directories-automake.patch
  Log:
  Fixes to prevent leaving empty directories around when the wrong patch level is used or if --dry-run is specified. bug #478548
  
  (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)

Revision  Changes    Path
1.1                  sys-devel/patch/files/patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/patch/files/patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/patch/files/patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch?rev=1.1&content-type=text/plain

Index: patch-2.7.1-dry-run-mode-create-temp-files-in-temp-dir.patch
===================================================================
From afdfa9ec8e5f9acea4afaa0db758a4ed752dbe65 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@××××××.com>
Date: Tue, 30 Jul 2013 10:46:19 +0000
Subject: In dry-run mode, create temporary files in a temporary directory

* src/util.c (make_tempfile): Do not create temporary files in the final output
directory when in dry-run mode: the path may be read-only.  In addition, we do
not want to leave intermediary empty output directories around.
---
diff --git a/src/util.c b/src/util.c
index 1cc1a68..0af6013 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1599,7 +1599,7 @@ make_tempfile (char const **name, char letter, char const *real_name,
   int try_makedirs_errno = ENOENT;
   char *template;
 
-  if (real_name)
+  if (real_name && ! dry_run)
     {
       char *dirname, *basename;
 
--
cgit v0.9.0.2



1.1                  sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories.patch?rev=1.1&content-type=text/plain

Index: patch-2.7.1-Fix-removing-empty-directories.patch
===================================================================
From 2f40ef66bea54be23a24f616cde021d8d7fc25be Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@××××××.com>
Date: Sun, 10 Mar 2013 18:02:54 +0000
Subject: Fix removing empty directories

Reported by Thomas Moschny <thomas.moschny@×××.de>:
src/patch.c (main): Temporary output files are created in the same directory as
the output file.  Make sure to remove them before removing empty files and
their empty ancestor directories; else the directories won't be empty.
tests/remove-directories: Add directory removal test case.
tests/Makefile.am (TESTS): Add new test case.
---
diff --git a/src/patch.c b/src/patch.c
index 0255fbb..010c14a 100644
--- a/src/patch.c
+++ b/src/patch.c
@@ -646,8 +646,8 @@ main (int argc, char **argv)
     if (outstate.ofp && (ferror (outstate.ofp) || fclose (outstate.ofp) != 0))
       write_fatal ();
     output_files (NULL);
-    delete_files ();
     cleanup ();
+    delete_files ();
     if (somefailed)
       exit (1);
     return 0;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5cea52d..cfc4f37 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -50,6 +50,7 @@ TESTS = \
 	reject-format \
 	remember-backup-files \
 	remember-reject-files \
+	remove-directories \
 	symlinks \
 	unmodified-files
 
diff --git a/tests/remove-directories b/tests/remove-directories
new file mode 100644
index 0000000..6acdc49
--- a/dev/null
+++ b/tests/remove-directories
@@ -0,0 +1,29 @@
+# Copyright (C) 2013 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# in any medium, are permitted without royalty provided the copyright
+# notice and this notice are preserved.
+
+. $srcdir/test-lib.sh
+
+require_cat
+use_local_patch
+use_tmpdir
+
+# ==============================================================
+# Remove empty parent diectories when removing a file
+
+mkdir dir
+echo foobar > dir/file
+cat > apatch <<EOF
+--- dir/file
++++ /dev/null
+@@ -1 +0,0 @@
+-foobar
+EOF
+
+check 'patch -p0 -E < apatch' <<EOF
+patching file dir/file
+EOF
+
+ncheck '! test -e dir'
--
cgit v0.9.0.2



1.1                  sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories-automake.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories-automake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/patch/files/patch-2.7.1-Fix-removing-empty-directories-automake.patch?rev=1.1&content-type=text/plain

Index: patch-2.7.1-Fix-removing-empty-directories-automake.patch
===================================================================
Simple patch to prevent sys-devel/patch needing to depend on autotools to
be built, which would likely make stage1 people unhappy.

By: Doug Goldstein <cardoe@g.o>
Ref: bug #478548
---
--- a/tests/Makefile.in	2012-09-28 11:41:32.000000000 -0500
+++ b/tests/Makefile.in	2013-07-31 07:55:44.879904245 -0500
@@ -1104,6 +1104,7 @@
 	reject-format \
 	remember-backup-files \
 	remember-reject-files \
+	remove-directories \
 	symlinks \
 	unmodified-files
 
@@ -1352,6 +1353,8 @@
 	@p='remember-backup-files'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 remember-reject-files.log: remember-reject-files
 	@p='remember-reject-files'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+remove-directories.log: remove-directories
+	@p='remove-directories'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 symlinks.log: symlinks
 	@p='symlinks'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 unmodified-files.log: unmodified-files