X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=inline;f=lib%2FPackages%2FConfig.pm;h=e749735c3ae4229c46420d8c4b04bf0337ebddda;hb=411dd86a5f305fcce69912b47f84dc16914d2da1;hp=538e912e855a965485eeffde8f4c9d8353f5befb;hpb=f27f1fcc5bffc0696f694e962eb40dbb0c554855;p=deb%2Fpackages.git diff --git a/lib/Packages/Config.pm b/lib/Packages/Config.pm index 538e912..e749735 100644 --- a/lib/Packages/Config.pm +++ b/lib/Packages/Config.pm @@ -8,13 +8,13 @@ use Packages::CGI; our @ISA = qw( Exporter ); -our ( $TOPDIR, $DBDIR, $ROOT, $HOME, $CONTACT_MAIL, $WEBMASTER_MAIL, +our ( $TOPDIR, $DBDIR, $ROOT, $HOSTNAME, $HOME, $CONTACT_MAIL, $WEBMASTER_MAIL, $SEARCH_PAGE, $SEARCH_URL, @LANGUAGES, $LOCALES, $SRC_SEARCH_URL, $CONTENTS_SEARCH_CGI, $CN_HELP_URL, $BUG_URL, $SRC_BUG_URL, $QA_URL, $DDPO_URL, @SUITES, @SECTIONS, @ARCHIVES, @ARCHITECTURES, %FTP_SITES ); -our @EXPORT_OK = qw( $TOPDIR $DBDIR $ROOT $HOME $CONTACT_MAIL +our @EXPORT_OK = qw( $TOPDIR $DBDIR $ROOT $HOSTNAME $HOME $CONTACT_MAIL $WEBMASTER_MAIL @LANGUAGES $LOCALES $SEARCH_PAGE $SEARCH_URL $SRC_SEARCH_URL $CONTENTS_SEARCH_CGI @@ -27,9 +27,9 @@ our $config_read_time; sub init { my ($dir) = @_; - my $modtime = (stat( "$dir/config.sh" ))[9]; + 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." ); } @@ -38,6 +38,7 @@ sub init { chomp; $TOPDIR = $1 if /^\s*topdir="?([^\"]*)"?\s*$/o; $ROOT = $1 if /^\s*root="?([^\"]*)"?\s*$/o; + $HOSTNAME = $1 if /^\s*hostname="?([^\"]*)"?\s*$/o; $HOME = $1 if /^\s*home="?([^\"]*)"?\s*$/o; $LOCALES = $1 if /^\s*localedir="?([^\"]*)"?\s*$/o; # $SEARCH_CGI = $1 if /^\s*search_cgi="?([^\"]*)"?\s*$/o;