From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 14 Apr 2008 16:23:48 +0000 (-0400)
Subject: [project @ peter@palfrader.org-20080414162348-qbi3wmnry0rrzwaz]
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=226f1762ac9c6b031ca7783749b32fda4a0731a5;p=mirror%2Fdsa-nagios.git

[project @ peter@palfrader.org-20080414162348-qbi3wmnry0rrzwaz]
dsa-check-dabackup: ignore .bak files in confdir.
---

diff --git a/dsa-nagios-nrpe-config/debian/changelog b/dsa-nagios-nrpe-config/debian/changelog
index 08a7a58..9477392 100644
--- a/dsa-nagios-nrpe-config/debian/changelog
+++ b/dsa-nagios-nrpe-config/debian/changelog
@@ -1,3 +1,9 @@
+dsa-nagios-nrpe-config (28) unstable; urgency=low
+
+  * dsa-check-dabackup: ignore .bak files in confdir.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 14 Apr 2008 12:23:25 -0400
+
 dsa-nagios-nrpe-config (27) unstable; urgency=low
 
   * Change OK text when da-backup not installed.
diff --git a/dsa-nagios-nrpe-config/dsa-check-dabackup b/dsa-nagios-nrpe-config/dsa-check-dabackup
index 8e707a4..d33b8ae 100755
--- a/dsa-nagios-nrpe-config/dsa-check-dabackup
+++ b/dsa-nagios-nrpe-config/dsa-check-dabackup
@@ -104,7 +104,7 @@ die ("No confdir found in $DABACKUP_CONF") unless defined $confdir;
 die ("No logdir found in $DABACKUP_CONF") unless defined $logdir;
 
 opendir(DIR, $confdir) or die ("Cannot opendir $confdir: $!\n");
-my %conffiles = map {$_ => 1} grep { !/^\./ } readdir(DIR);
+my %conffiles = map {$_ => 1} grep { !/^\./ && !/\.bak$/} readdir(DIR);
 closedir(DIR);
 
 opendir(DIR, $logdir) or die ("Cannot opendir $logdir: $!\n");