From 59b918bbce20a2258d25443bb01dbd99255f1d54 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Tue, 19 Jul 2005 21:52:59 +0000
Subject: Bug 265188: GenerateVersionTable should only overwrite versioncache
 if it's changed - Patch by Frédéric Buclin <LpSolit@gmail.com>
 r=glob,justdave a=justdave
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 globals.pl | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'globals.pl')

diff --git a/globals.pl b/globals.pl
index 89e70e0a8..780e85e0b 100644
--- a/globals.pl
+++ b/globals.pl
@@ -325,23 +325,18 @@ sub GetKeywordIdFromName {
 $::VersionTableLoaded = 0;
 sub GetVersionTable {
     return if $::VersionTableLoaded;
-    my $mtime = file_mod_time("$datadir/versioncache");
-    if (!defined $mtime || $mtime eq "" || !-r "$datadir/versioncache") {
-        $mtime = 0;
-    }
-    if (time() - $mtime > 3600) {
-        use Bugzilla::Token;
-        Bugzilla::Token::CleanTokenTable() if Bugzilla->dbwritesallowed;
+    my $file_generated = 0;
+    if (!-r "$datadir/versioncache") {
         GenerateVersionTable();
+        $file_generated = 1;
     }
     require "$datadir/versioncache";
-    if (!defined %::versions) {
+    if (!defined %::versions && !$file_generated) {
         GenerateVersionTable();
         do "$datadir/versioncache";
-
-        if (!defined %::versions) {
-            die "Can't generate file $datadir/versioncache";
-        }
+    }
+    if (!defined %::versions) {
+        die "Can't generate file $datadir/versioncache";
     }
     $::VersionTableLoaded = 1;
 }
-- 
cgit v1.2.3-24-g4f1b