Fixed guardian ignore file handling and linefead detection.

diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl
index b5c3f9c16ae78c3499b5c2f062396f6ffd784177..8c2e3b7046e98a3094bd1f28e8a7908dbbd7c866 100644 (file)
--- a/config/guardian/guardian.pl
+++ b/config/guardian/guardian.pl
@@ -211,7 +211,8 @@ sub build_ignore_hash {
        if ($ignorefile ne "") {
                open (IGNORE, $ignorefile);
                while (<IGNORE>) {
-                       chop;
+                       $_=~ s/\s+$//;
+                       chomp;
                        next if (/\#/);  #skip comments
                        next if (/^\s*$/); # and blank lines
                        $ignore{$_}=1;

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 42a483d9c6255cb1ac31a57d6688dbac0b95c715..acde82953eb042a1f9f2c008043e69b6ef08281b 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -296,7 +296,7 @@
 * rssdler-0.4.0a
 * rsync-3.0.7
 * rtorrent-0.8.6
-* samba-3.5.3
+* samba-3.5.4
 * sane-1.0.19
 * screen-4.0.3
 * sdparm-1.01