From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Thu, 24 Jun 2010 19:39:07 +0000 (+0200)
Subject: Fixed guardian ignore file handling and linefead detection.
X-Git-Tag: v2.9-beta1~183^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd4da55b68527cfef08eeffbb39915cf2ee01ed9;p=people%2Fpmueller%2Fipfire-2.x.git

Fixed guardian ignore file handling and linefead detection.
---

diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl
index b5c3f9c16a..8c2e3b7046 100644
--- 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 42a483d9c6..acde82953e 100644
--- 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