[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-3-g8a90c98



The following commit has been merged in the master branch:
commit 8a90c986f58990ce6a6fbe0f0db1d7eacb267343
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Apr 7 21:35:46 2011 +0200

    Merged two nearly identical if-branches

diff --git a/checks/files b/checks/files
index 167d85a..a540c21 100644
--- a/checks/files
+++ b/checks/files
@@ -335,12 +335,8 @@ foreach my $file (@{$info->sorted_index}) {
 	    }
 	    close(PHPINI);
 	}
-	# ---------------- /etc/rc.d
-	elsif ($type ne 'udeb' and $file =~ m,^etc/rc\.d/\S, and $pkg !~ /^(?:sysvinit|file-rc)$/) {
-	    tag 'package-installs-into-etc-rc.d', $file;
-	}
-	# ---------------- /etc/rc?.d
-	elsif ($type ne 'udeb' and $file =~ m,^etc/rc(?:\d|S)\.d/\S, and $pkg !~ /^(?:sysvinit|file-rc)$/) {
+	# ---------------- /etc/rc.d && /etc/rc?.d
+	elsif ($type ne 'udeb' and $file =~ m,^etc/rc(?:\d|S)?\.d/\S, and $pkg !~ /^(?:sysvinit|file-rc)$/) {
 	    tag 'package-installs-into-etc-rc.d', $file;
 	}
 	# ---------------- /etc/rc.boot

-- 
Debian package checker


Reply to: