[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog base.c [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog base.c [signed-commits2] |
Date: |
Wed, 14 Dec 2005 00:21:32 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: signed-commits2
Changes by: Derek Robert Price <address@hidden> 05/12/14 00:21:32
Modified files:
src : ChangeLog base.c
Log message:
* base.c (ibase_copy, base_merge): Remove signature files when using
temp files or SUPPRESS_BASES.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=signed-commits2&tr1=1.3306.2.47&tr2=1.3306.2.48&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/base.c.diff?only_with_tag=signed-commits2&tr1=1.1.2.14&tr2=1.1.2.15&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3306.2.47 ccvs/src/ChangeLog:1.3306.2.48
--- ccvs/src/ChangeLog:1.3306.2.47 Wed Dec 14 00:06:56 2005
+++ ccvs/src/ChangeLog Wed Dec 14 00:21:31 2005
@@ -1,5 +1,8 @@
2005-12-13 Derek Price <address@hidden>
+ * base.c (ibase_copy, base_merge): Remove signature files when using
+ temp files or SUPPRESS_BASES.
+
Send signature files to client with base files.
* base.c (base_checkout): Comment where the signature verification
will take place.
Index: ccvs/src/base.c
diff -u ccvs/src/base.c:1.1.2.14 ccvs/src/base.c:1.1.2.15
--- ccvs/src/base.c:1.1.2.14 Wed Dec 14 00:06:56 2005
+++ ccvs/src/base.c Wed Dec 14 00:21:32 2005
@@ -437,8 +437,15 @@
if (server_active && strcmp (cvs_cmd_name, "export"))
server_base_copy (finfo, rev ? rev : "", flags);
- if ((suppress_bases || tempfile) && CVS_UNLINK (basefile) < 0)
- error (0, errno, "Failed to remove temp file `%s'", basefile);
+ if (suppress_bases || tempfile)
+ {
+ char *sigfile = Xasprintf ("%s.sig", basefile);
+ if (CVS_UNLINK (basefile) < 0)
+ error (0, errno, "Failed to remove temp file `%s'", basefile);
+ if (CVS_UNLINK (sigfile) < 0 && !existence_error (errno))
+ error (0, errno, "Failed to remove temp file `%s'", sigfile);
+ free (sigfile);
+ }
if (!tempfile)
free ((char *)basefile);
}
@@ -559,8 +566,12 @@
*/
if (join || noexec || suppress_bases)
{
+ char *sigfile = Xasprintf ("%s.sig", f2);
if (CVS_UNLINK (f2) < 0)
error (0, errno, "unable to remove `%s'", f2);
+ if (CVS_UNLINK (sigfile) < 0 && !existence_error (errno))
+ error (0, errno, "unable to remove `%s'", sigfile);
+ free (sigfile);
}
free (f1);
free (f2);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/src ChangeLog base.c [signed-commits2],
Derek Robert Price <=