[Logcheck-commits] Hannes von Haugwitz: i.d.s/cron-apt: allow optional whitespace

[Hannes von Haugwitz]

Module: logcheck
Branch: master
Commit: bfdc9bb6e2ec1ff14d9d0c5349f1e6983b62c470
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=bfdc9bb6e2ec1ff14d9d0c5349f1e6983b62c470

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Fri Feb 18 19:52:24 2011 +0100

i.d.s/cron-apt: allow optional whitespace

closes: #609649

---

 debian/changelog                         |    3 +++
 rulefiles/linux/ignore.d.server/cron-apt |   12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b52cf0..f4ff9d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ logcheck (1.3.14) unstable; urgency=low
     - adjusted rule to match serial terminals
   * ignore.d.workstation/kernel:
     - ignore "Spinning up disk" message
+  * ignore.d.server/cron-apt:
+    - allow optional whitespace between value and unit, thanks to
+      Gabor Kiss (closes: #609649)
 
  -- Hannes von Haugwitz <hannes at vonhaugwitz.com>  Thu, 17 Feb 2011 06:43:37 +0100
 
diff --git a/rulefiles/linux/ignore.d.server/cron-apt b/rulefiles/linux/ignore.d.server/cron-apt
index c3a2b9f..6870cba 100644
--- a/rulefiles/linux/ignore.d.server/cron-apt
+++ b/rulefiles/linux/ignore.d.server/cron-apt
@@ -1,6 +1,6 @@
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: E: Some index files failed to download, they have been ignored, or old ones used instead\.$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: After this operation, [.[:digit:]]+[kMGTPEZY]?B (of additional disk space will be used|disk space will be freed)\.$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: After unpacking [[:digit:].]+([kMGTPEZY]?B) (of additional disk space will be used|disk space will be freed)\.$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: After this operation, [.[:digit:]]+ ?[kMGTPEZY]?B (of additional disk space will be used|disk space will be freed)\.$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: After unpacking [[:digit:].]+ ?([kMGTPEZY]?B) (of additional disk space will be used|disk space will be freed)\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Building [dD]ependency [tT]ree\.\.\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: CRON-APT ACTION: (0-update|3-download)$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: CRON-APT LINE: (/usr/bin/apt-get )?autoclean -y$
@@ -8,12 +8,12 @@
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: CRON-APT LINE: (/usr/bin/apt-get )?update -o quiet=2$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: CRON-APT RUN \[[-[:alnum:]/]+\]: \w{3} \w{3} [ [:digit:]]+ [:[:digit:]]{8} \w{3,4} [[:digit:]]{4}$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: CRON-APT SLEEP: [[:digit:]]+, \w{3} \w{3} [ [:digit:]]+ [:[:digit:]]{8} \w{3,4} [[:digit:]]{4}$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Del [-[:alnum:]_+.]+ \[[.[:digit:]]+[kMGTPEZY]?B\]$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Del [-[:alnum:]_+.]+ \[[.[:digit:]]+ ?[kMGTPEZY]?B\]$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Download complete and in download only mode$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: E: Some index files failed to download, they have been ignored, or old ones used instead\.$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Fetched [[:digit:].]+[kMGTPEZY]?B in ((([[:digit:]]+d )?[[:digit:]]+h ?)?[[:digit:]]+m(in)? ?)?[[:digit:]]+s \([[:digit:].]+[kMGTPEZY]?B/s\)$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Get:[[:digit:]]+ ((ht|f)tp|file)://[.[:alnum:]/_-]+ [./[:alnum:]-]+ [-[:alnum:]_+.]+ [+.:~[:alnum:]-]+ \[[.[:digit:]]+[kMGTPEZY]?B\]$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Need to get [[:digit:].]+([kMGTPEZY]?B)(/[.[:digit:]]+([kMGTPEZY]?B))* of archives\.$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Fetched [[:digit:].]+ ?[kMGTPEZY]?B in ((([[:digit:]]+d )?[[:digit:]]+h ?)?[[:digit:]]+m(in)? ?)?[[:digit:]]+s \([[:digit:].]+ ?[kMGTPEZY]?B/s\)$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Get:[[:digit:]]+ ((ht|f)tp|file)://[.[:alnum:]/_-]+ [./[:alnum:]-]+ [-[:alnum:]_+.]+ [+.:~[:alnum:]-]+ \[[.[:digit:]]+ ?[kMGTPEZY]?B\]$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Need to get [[:digit:].]+ ?([kMGTPEZY]?B)(/[.[:digit:]]+ ?([kMGTPEZY]?B))* of archives\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Reading [pP]ackage [lL]ists\.\.\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Reading state information\.\.\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: The following NEW packages will be installed:$