Fix several minor issues, mostly configuration-like stuff

diff --git a/bin/daily b/bin/daily
index 0d5afb414557cf7a89b9fa989070183b8ddb27d7..e4325939328f5cc1139a2ce7c995d553f03ff507 100755 (executable)
--- a/bin/daily
+++ b/bin/daily
@@ -19,7 +19,7 @@
 # Should run after the mirror pulse.  The mirror tends to finish by
 # the ctime of rsync.log.* in ~archvsync.
 
-topdir=/org/packages.debian.org
+source config.sh
 files=$topdir/files
 logs=$files/logs
 log=$logs/cron.log

diff --git a/cgi-bin/search_packages.pl b/cgi-bin/search_packages.pl
index 22e9495808dd5c6252ee9b254125a82eac413c3b..5a31a1c961e82075a9b192d158560b5871372426 100755 (executable)
--- a/cgi-bin/search_packages.pl
+++ b/cgi-bin/search_packages.pl
@@ -12,6 +12,7 @@
 # see http://www.fsf.org/copyleft/gpl.html for a copy of the license
 
 use strict;
+use lib '../lib';
 use CGI qw( -oldstyle_urls );
 use CGI::Carp qw( fatalsToBrowser );
 use POSIX;

diff --git a/cgi-bin/show_package.pl b/cgi-bin/show_package.pl
index 53d0f7be63c670c56bc15a8135d00cfeae20ba4b..a98337ad258095237fb0fe777aca9f2e29bccf99 100755 (executable)
--- a/cgi-bin/show_package.pl
+++ b/cgi-bin/show_package.pl
@@ -13,6 +13,7 @@
 # see http://www.fsf.org/copyleft/gpl.html for a copy of the license
 
 use strict;
+use lib '../lib';
 use CGI qw( -oldstyle_urls );
 use CGI::Carp qw( fatalsToBrowser );
 use POSIX;

diff --git a/lib/Packages/CGI.pm b/lib/Packages/CGI.pm
index cac499fbc45658ddcf32663f9b20fc46592b2d01..b2b261db705b7c009b9cb62c2534b2c3ed4039a7 100644 (file)
--- a/lib/Packages/CGI.pm
+++ b/lib/Packages/CGI.pm
@@ -30,6 +30,9 @@ sub debug {
 sub msg {
     push @msgs, $_[0];
 }
+sub note {
+    push @notes, $_[0];
+}
 sub notes {
     push @notes, [ @_ ];
 }

diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index 826461a0e944cb035a3a074c44802fd6373116a0..74939717c97280668bf871d405e6b4c593571912 100644 (file)
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -144,7 +144,7 @@ sub pmoreinfo {
        $str .= " <a href=\"/$path/source/$source\">$source</a>, ".
            gettext( "Download" ).":\n";
 
-       unless (@$files) {
+       unless (defined($files) and @$files) {
            $str .= gettext( "Not found" );
        } else {
            foreach( @$files ) {

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index 550b9894763f3114d95a9f8277504615fbd18155..b00eefbab921974b68df2784be42faaeb5df93e6 100644 (file)
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -6,7 +6,6 @@ use warnings;
 use Data::Dumper;
 use Deb::Versions;
 use Packages::CGI;
-use IO::String;
 
 our $ARCHIVE_DEFAULT = '';
 our $SECTION_DEFAULT = 'main';