From bd84d196310b1ca8e3f1298de31f050dbef78fd9 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 10 Jan 2011 22:57:49 -0500 Subject: [PATCH] Wiki revs now work again - replaced --global-reject-file with -r --- citadel/modules/wiki/serv_wiki.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c index 5f1845757..f5c7ebbe2 100644 --- 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 */ - //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); -- 2.30.2