Added NULL check for &search*();

Added stubs for archived revisions.

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@114 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/Modules/Debian.pl b/src/Modules/Debian.pl
index 3482b0a97861dd84d49234439a560c993fe76950..a9aa5997239e5e770644cb0e0acecc61bcd9680a 100644 (file)
--- a/src/Modules/Debian.pl
+++ b/src/Modules/Debian.pl
@@ -1,7 +1,7 @@
 #
 #   Debian.pl: Frontend to debian contents and packages files
 #      Author: dms
-#     Version: v0.7b (20000527)
+#     Version: v0.8 (20000918)
 #     Created: 20000106
 #
 
@@ -15,6 +15,10 @@ my %dists    = (
        "unstable"      => "woody",
        "stable"        => "potato",
        "incoming"      => "incoming",
+       "slink"         => "archive-2.1",
+       "hamm"          => "archive-2.0",
+       "rex"           => "archive-1.?",
+       "bo"            => "archive-1.?",
 );
 
 my %urlcontents = (
@@ -328,8 +332,14 @@ sub searchAuthor {
        if (/^Package: (\S+)$/) {
            $package = $1;
        } elsif (/^Maintainer: (.*) \<(\S+)\>$/) {
-           $maint{$1}{$2} = 1;
-           $pkg{$1}{$package} = 1;
+           my($name,$email) = ($1,$2);
+           if ($package eq "") {
+               &main::DEBUG("sA: package == NULL.");
+               next;
+           }
+           $maint{$name}{$email} = 1;
+           $pkg{$name}{$package} = 1;
+           $package = "";
        } else {
            &main::WARN("invalid line: '$_'.");
        }
@@ -421,7 +431,12 @@ sub searchDesc {
        } elsif (/^Description: (.*)$/) {
            my $desc = $1;
            next unless ($desc =~ /\Q$query\E/i);
+           if ($package eq "") {
+               &main::WARN("sD: package == NULL?");
+               next;
+           }
            $desc{$package} = $desc;
+           $package = "";
        } else {
            &main::WARN("invalid line: '$_'.");
        }
@@ -936,6 +951,12 @@ sub getDistro {
        $dist = $defaultdist;
     }
 
+    if ($dist =~ /^(slink|hamm|rex|bo)$/i) {
+       &main::DEBUG("Debian: deprecated version ($dist).");
+       &main::msg($main::who, "Debian: deprecated distribution version.");
+       return;
+    }
+
     if (exists $dists{$dist}) {
        return $dists{$dist};
     } else {