When we 503, do it in HTML
authorArt Cancro <ajc@citadel.org>
Tue, 11 Jan 2011 03:53:12 +0000 (22:53 -0500)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 4 Sep 2011 13:52:13 +0000 (13:52 +0000)
citadel/modules/wiki/serv_wiki.c

index 0399124b396e44949fccfdc29af3070d37fbbf89..b24822274fbe8577fdd7ebd9c1479dfd81a7c82a 100644 (file)
@@ -422,7 +422,8 @@ 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 -r /dev/null >/dev/null 2>/dev/null", "w");
+       //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");
        if (fp) {
                /* Replace the filenames in the patch with the tempfilename we're actually tweaking */
                fprintf(fp, "--- %s\n", hecbd->tempfilename);