fix --setup --render

In this mode, rebuild mode should not be on

diff --git a/debian/changelog b/debian/changelog
index bee31b36e7dd3852c95c256a4fba477cd4d12df4..0c3fded413d99e1a2d06ba2b5af7dd96161745c4 100644 (file)
--- 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 ca499b115ae0e758b5a7c38d2fbcc4fd4944c597..d2f5d48dcc85889090f87b22c5684b81844f6d28 100755 (executable)
--- 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;
                }
        }