- irctextcounters: add percentage to top3

[infobot.git] / src / Modules / Debian.pl

diff --git a/src/Modules/Debian.pl b/src/Modules/Debian.pl
index 2ae82cf6bfb41f6dc3ad2579be0d0bc1da58dd46..1053f167839094d0b884cc74c30dd0495fdaff56 100644 (file)
--- a/src/Modules/Debian.pl
+++ b/src/Modules/Debian.pl
@@ -166,7 +166,7 @@ sub DebianDownload {
 # Usage: &searchContents($query);
 sub searchContents {
     my ($dist, $query) = &getDistroFromStr($_[0]);
-    &::status("Debian: Contents search for '$query' on $dist.");
+    &::status("Debian: Contents search for '$query' in '$dist'.");
     my $dccsend        = 0;
 
     $dccsend++         if ($query =~ s/^dcc\s+//i);
@@ -200,10 +200,10 @@ sub searchContents {
     my $grepRE;
     ### TODO: search properly if /usr/bin/blah is done.
     if ($query =~ s/\$$//) {
-       &::DEBUG("deb: search-regex found.");
+       &::DEBUG("deb: search-regex found.") if ($debug);
        $grepRE = "$query\[ \t]";
     } elsif ($query =~ s/^\^//) {
-       &::DEBUG("deb: front marker regex found.");
+       &::DEBUG("deb: front marker regex found.") if ($debug);
        $front = 1;
        $grepRE = $query;
     } else {
@@ -315,7 +315,7 @@ sub searchContents {
        &::pSReply( &::formListReply(0, $prefix, @list) );
 
     } else {           # !@list.
-       &::DEBUG("deb: ok, !\@list, searching desc for '$query'.");
+       &::DEBUG("deb: ok, !\@list, searching desc for '$query'.") if ($debug);
        my @list = &searchDesc($query);
 
        if (!scalar @list) {
@@ -360,7 +360,7 @@ sub searchAuthor {
        $files .= " ".$_;
     }
 
-    &::DEBUG("deb: good = $good, bad = $bad...");
+    &::DEBUG("deb: good = $good, bad = $bad...") if ($debug);
 
     if ($good == 0 and $bad != 0) {
        my %urls = &fixDist($dist, %urlpackages);
@@ -422,7 +422,7 @@ sub searchAuthor {
        return 1;
     }
 
-    &::DEBUG("deb: showing all packages by '$list[0]'...");
+    &::DEBUG("deb: showing all packages by '$list[0]'...") if ($debug);
 
     my @pkg = sort keys %{ $pkg{$list[0]} };
 
@@ -439,7 +439,7 @@ sub searchAuthor {
 # Usage: &searchDesc($query);
 sub searchDesc {
     my ($dist, $query) = &getDistroFromStr($_[0]);
-    &::DEBUG("deb: searchDesc: dist => '$dist', query => '$query'.");
+    &::DEBUG("deb: searchDesc: dist => '$dist', query => '$query'.") if ($debug);
     $query =~ s/^\s+|\s+$//g;
 
     # start of search.
@@ -462,7 +462,7 @@ sub searchDesc {
        $files .= " ".$_;
     }
 
-    &::DEBUG("deb(2): good = $good, bad = $bad...");
+    &::DEBUG("deb(2): good = $good, bad = $bad...") if ($debug);
 
     if ($good == 0 and $bad != 0) {
        my %urls = &fixDist($dist, %urlpackages);
@@ -516,7 +516,7 @@ sub generateIncoming {
     my $stale   = 0;
     $stale++ if (&::isStale($pkgfile.".gz", $refresh));
     $stale++ if (&::isStale($idxfile, $refresh));
-    &::DEBUG("deb: gI: stale => '$stale'.");
+    &::DEBUG("deb: gI: stale => '$stale'.") if ($debug);
     return 0 unless ($stale);
 
     ### STATIC URL.
@@ -851,9 +851,6 @@ sub generateIndex {
     foreach (@dists) {
        my $dist = &getDistro($_); # incase the alias is returned, possible?
        my $idx  = "debian/Packages-$dist.idx";
-       &::DEBUG("deb: gI: dist => $dist.");
-       &::DEBUG("deb: gI: idx  => $idx.");
-       &::DEBUG("deb: gI: r    => $refresh.");
 
        # TODO: check if any of the Packages file have been updated then
        #       regenerate it, even if it's not stale.
@@ -986,10 +983,10 @@ sub searchPackage {
            $file = $1;
 
            if (&::isStale($file, $refresh)) {
-               &::DEBUG("deb: STALE $file! regen.");
+               &::DEBUG("deb: STALE $file! regen.") if ($debug);
                &generateIndex(($dist));
 ###            @files = searchPackage("$query $dist");
-               &::DEBUG("deb: EVIL HACK HACK HACK.");
+               &::DEBUG("deb: EVIL HACK HACK HACK.") if ($debug);
                last;
            }