[packages/cvs.git] / cvs-debian-import-n-X.patch

--- cvs-1.12.13.orig/debian/patches/25_import-n-X
+++ cvs-1.12.13/debian/patches/25_import-n-X
@@ -0,0 +1,15 @@
+# Fix `cvs import -X' failure
+# Fixes: #374964
+# Patch by Florian Zschocke <zschocke@gmx.net>
+diff -ruN cvs-1.12.13-old/src/import.c cvs-1.12.13/src/import.c
+--- cvs-1.12.13-old/src/import.c	2005-09-04 02:27:44.000000000 +0200
++++ cvs-1.12.13/src/import.c	2006-06-19 19:41:57.000000000 +0200
+@@ -595,7 +595,7 @@
+ 		/* Attempt to make the Attic directory, in case it
+ 		   does not exist.  */
+ 		(void) sprintf (rcs, "%s/%s", repository, CVSATTIC);
+-		if (CVS_MKDIR (rcs, 0777 ) != 0 && errno != EEXIST)
++		if (noexec == 0 && CVS_MKDIR (rcs, 0777 ) != 0 && errno != EEXIST)
+ 		    error (1, errno, "cannot make directory `%s'", rcs);
+ 
+ 		/* Note that the above clobbered the path name, so we
Commit	Line	Data
76652ff6 AM	1	--- cvs-1.12.13.orig/debian/patches/25_import-n-X
	2	+++ cvs-1.12.13/debian/patches/25_import-n-X
	3	@@ -0,0 +1,15 @@
	4	+# Fix `cvs import -X' failure
	5	+# Fixes: #374964
	6	+# Patch by Florian Zschocke <zschocke@gmx.net>
	7	+diff -ruN cvs-1.12.13-old/src/import.c cvs-1.12.13/src/import.c
	8	+--- cvs-1.12.13-old/src/import.c 2005-09-04 02:27:44.000000000 +0200
	9	++++ cvs-1.12.13/src/import.c 2006-06-19 19:41:57.000000000 +0200
	10	+@@ -595,7 +595,7 @@
	11	+ /* Attempt to make the Attic directory, in case it
	12	+ does not exist. */
	13	+ (void) sprintf (rcs, "%s/%s", repository, CVSATTIC);
	14	+- if (CVS_MKDIR (rcs, 0777 ) != 0 && errno != EEXIST)
	15	++ if (noexec == 0 && CVS_MKDIR (rcs, 0777 ) != 0 && errno != EEXIST)
	16	+ error (1, errno, "cannot make directory `%s'", rcs);
	17	+
	18	+ /* Note that the above clobbered the path name, so we