X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FConfig.pm;h=a7014f81f2353cc2af2fc6bf4053c6121348fee2;hb=HEAD;hp=96f8b679ccc8c76ec5446abd1f51ee5096a5427b;hpb=36cd772d5715368c75f6aa7bef3dc526aa876a76;p=deb%2Fpackages.git

diff --git a/lib/Packages/Config.pm b/lib/Packages/Config.pm
index 96f8b67..a7014f8 100644
--- a/lib/Packages/Config.pm
+++ b/lib/Packages/Config.pm
@@ -8,12 +8,12 @@ use Packages::CGI qw( :DEFAULT error );
 
 our @ISA = qw( Exporter );
 
-our ( $TOPDIR, $DBDIR, $TEMPLATEDIR, $CACHEDIR, $ROOT,
-      @LANGUAGES, @DDTP_LANGUAGES, $LOCALES,
+our ( $TOPDIR, $DBDIR, $TEMPLATEDIR, $CACHEDIR, $ROOT, $SEARCH_URL,
+      @LANGUAGES, @DDTP_LANGUAGES,
       @SUITES, @SECTIONS, @ARCHIVES, @ARCHITECTURES,
       @PRIORITIES, %FTP_SITES );
-our @EXPORT_OK = qw( $TOPDIR $DBDIR $TEMPLATEDIR $CACHEDIR $ROOT
-		     @LANGUAGES @DDTP_LANGUAGES $LOCALES
+our @EXPORT_OK = qw( $TOPDIR $DBDIR $TEMPLATEDIR $CACHEDIR $ROOT $SEARCH_URL
+		     @LANGUAGES @DDTP_LANGUAGES
 		     @SUITES @SECTIONS @ARCHIVES @ARCHITECTURES
 		     @PRIORITIES %FTP_SITES  );
 our %EXPORT_TAGS = ( all => [ @EXPORT_OK ] );
@@ -24,7 +24,7 @@ sub init {
     my ($dir) = @_;
     my $modtime = (stat( "$dir/config.sh" ))[9] || 0;
     $config_read_time ||= 0;
-    if ($modtime >= $config_read_time) {
+    if ($modtime > $config_read_time) {
 	if (!open (C, '<', "$dir/config.sh")) {
 	    error( "Internal: Cannot open configuration file." );
 	}
@@ -35,7 +35,7 @@ sub init {
 	    $TEMPLATEDIR = $1 if /^\s*templatedir="?([^\"]*)"?\s*$/o;
 	    $CACHEDIR = $1 if /^\s*cachedir="?([^\"]*)"?\s*$/o;
 	    $ROOT = $1 if /^\s*root="?([^\"]*)"?\s*$/o;
-	    $LOCALES = $1 if /^\s*localedir="?([^\"]*)"?\s*$/o;
+	    $SEARCH_URL = $1 if /^\s*search_url="?([^\"]*)"?\s*$/o;
 	    $FTP_SITES{us} = $1 if /^\s*ftpsite="?([^\"]*)"?\s*$/o;
 	    $FTP_SITES{$1} = $2 if /^\s*(\w+)_ftpsite="?([^\"]*)"?\s*$/o;
 	    @LANGUAGES = split(/\s+/, $1) if /^\s*polangs="?([^\"]*)"?\s*$/o;
@@ -46,15 +46,16 @@ sub init {
 	    @ARCHITECTURES = split(/\s+/, $1) if /^\s*architectures="?([^\"]*)"?\s*$/o;
 	    @PRIORITIES = split(/\s+/, $1) if /^\s*priorities="?([^\"]*)"?\s*$/o;
 	}
-	foreach (($TEMPLATEDIR, $CACHEDIR, $LOCALES)) {
+	foreach (($TEMPLATEDIR, $CACHEDIR)) {
 	    s/\$\{?topdir\}?/$TOPDIR/g;
 	}
 	close (C);
+	unshift @LANGUAGES, 'en';
+	unshift @DDTP_LANGUAGES, 'en';
 	debug( "read config ($modtime > $config_read_time)" ) if DEBUG;
 	$config_read_time = $modtime;
     }
     $DBDIR = "$TOPDIR/files/db";
-    unshift @LANGUAGES, 'en';
 }
 
 1;