summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-10-30 14:59:37 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-10-30 14:59:37 -0400
commit6d445cdacabc15e8966912fd2ce6794863d64b8a (patch)
treea734dca2caff9b83ecd937fa2367b122183740e7
parentae0a9d50bebb061e3b6ec4cc08677b6e6ed69ac9 (diff)
fix --setup --render
In this mode, rebuild mode should not be on
-rw-r--r--debian/changelog1
-rwxr-xr-xikiwiki.in2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index bee31b36e..0c3fded41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
* git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
* shortcut: Fix display of shortcuts while previewing.
* Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
+ * Several fixes to --render mode.
-- Joey Hess <joeyh@debian.org> Fri, 17 Oct 2008 20:11:02 -0400
diff --git a/ikiwiki.in b/ikiwiki.in
index ca499b115..d2f5d48dc 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -156,7 +156,7 @@ sub main () { #{{{
}
# setup implies a wiki rebuild by default
- if (! $config{refresh}) {
+ if (! $config{refresh} && ! $config{render}) {
$config{rebuild}=1;
}
}