projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6395753
)
Wiki revs now work again - replaced --global-reject-file with -r
author
Art Cancro
<ajc@citadel.org>
Tue, 11 Jan 2011 03:57:49 +0000
(22:57 -0500)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Sun, 4 Sep 2011 11:18:53 +0000
(11:18 +0000)
citadel/modules/wiki/serv_wiki.c
patch
|
blob
|
history
diff --git
a/citadel/modules/wiki/serv_wiki.c
b/citadel/modules/wiki/serv_wiki.c
index 5f1845757560a1604cad5596708e536d1915085e..f5c7ebbe2cc175561c7987e6206d29a6409feb9e 100644
(file)
--- a/
citadel/modules/wiki/serv_wiki.c
+++ b/
citadel/modules/wiki/serv_wiki.c
@@
-422,8
+422,7
@@
void wiki_rev_callback(char *name, char *filename, char *partnum, char *disp,
CtdlLogPrintf(CTDL_DEBUG, "callback found rev: %s\n", this_rev);
/* Perform the patch */
CtdlLogPrintf(CTDL_DEBUG, "callback found rev: %s\n", this_rev);
/* Perform the patch */
- //fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>/dev/null", "w");
- fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>>/tmp/patcherr.txt", "w");
+ fp = popen("patch -f -s -p0 -r /dev/null >/dev/null 2>/dev/null", "w");
if (fp) {
/* Replace the filenames in the patch with the tempfilename we're actually tweaking */
fprintf(fp, "--- %s\n", hecbd->tempfilename);
if (fp) {
/* Replace the filenames in the patch with the tempfilename we're actually tweaking */
fprintf(fp, "--- %s\n", hecbd->tempfilename);