From: Art Cancro <ajc@citadel.org>
Date: Tue, 11 Jan 2011 03:57:49 +0000 (-0500)
Subject: Wiki revs now work again - replaced --global-reject-file with -r
X-Git-Tag: v8.11~918
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=180098c1d01f1f5caec05cedacb6cb30c412accd;ds=sidebyside

Wiki revs now work again - replaced --global-reject-file with -r
---

diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c
index b24822274..0399124b3 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,
 	syslog(LOG_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);