Make --no-gettime work in initial build. Closes: #755075

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e5da04a3bb86d8aa47d96cac3df679623ad707ee..cd4ac815dbba6beec9a4debc9d0410de01a342e4 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1819,7 +1819,8 @@ sub loadindex () {
                        open ($in, "<", "$config{wikistatedir}/indexdb") || return;
                }
                else {
                        open ($in, "<", "$config{wikistatedir}/indexdb") || return;
                }
                else {

-                       $config{gettime}=1; # first build
+                       # gettime on first build
+                       $config{gettime}=1 unless defined $config{gettime};

                        return;
                }
        }
                        return;
                }
        }

diff --git a/debian/changelog b/debian/changelog
index 9f9a9902a1aa61cb8277af2d86f6392a2c27c8a0..c76cd18ba93b83b957538634046e5803e8af902c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20140816) UNRELEASED; urgency=medium
+
+  * Make --no-gettime work in initial build. Closes: #755075
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 28 Aug 2014 19:07:50 -0700
+

 ikiwiki (3.20140815) unstable; urgency=medium
 
   * Add google back to openid selector. Apparently this has gotten a stay
 ikiwiki (3.20140815) unstable; urgency=medium
 
   * Add google back to openid selector. Apparently this has gotten a stay