[Pkg-cvs-commits] r23 - in /trunk: changelog patches/25_import-n-X

[zakame-guest at users.alioth.debian.org]

Author: zakame-guest
Date: Mon Jun 26 08:24:51 2006
New Revision: 23

URL: http://svn.debian.org/wsvn/?sc=1&rev=23
Log:
Fix #374964 ('cvs import -X' failure)

Added:
    trunk/patches/25_import-n-X
Modified:
    trunk/changelog

Modified: trunk/changelog
URL: http://svn.debian.org/wsvn/trunk/changelog?rev=23&op=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Mon Jun 26 08:24:51 2006
@@ -4,8 +4,11 @@ cvs (1:1.12.13-4) unstable; urgency=low
   * debian/rules:
     + Copy config.{guess,sub} to the (new) right location for
       1.12.13, thanks to Petr Salinger. (Closes: #372627)
+  * debian/patches:
+    + Add 25_import-n-X fixing `import -X' failure, thanks to
+      Florian Zschocke. (Closes: #374964)
 
- -- Zak B. Elep <zakame at spunge.org>  Sun, 11 Jun 2006 22:21:10 +0800
+ -- Zak B. Elep <zakame at spunge.org>  Mon, 26 Jun 2006 15:00:49 +0800
 
 cvs (1:1.12.13-3) unstable; urgency=low
 

Added: trunk/patches/25_import-n-X
URL: http://svn.debian.org/wsvn/trunk/patches/25_import-n-X?rev=23&op=file
==============================================================================
--- trunk/patches/25_import-n-X (added)
+++ trunk/patches/25_import-n-X Mon Jun 26 08:24:51 2006
@@ -0,0 +1,15 @@
+# Fix `cvs import -X' failure
+# Fixes: #374964
+# Patch by Florian Zschocke <zschocke at 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