[SCM] Debian package checker branch, master, updated. 2.2.0-11-gcabd8c3
The following commit has been merged in the master branch:
commit cabd8c3425f20f8d53dcd8ff7f9120d953b37ce8
Author: Russ Allbery <rra@debian.org>
Date: Fri Jan 30 16:51:55 2009 -0800
Minor improvements to the harness GPG_CHECK logic
Use if...else instead of unless...else. Use symlink instead of link
since the code checks for symlinks, not hard links.
diff --git a/reporting/harness b/reporting/harness
index 8fdccf8..8ed51d6 100755
--- a/reporting/harness
+++ b/reporting/harness
@@ -90,15 +90,15 @@ $ENV{'LINTIAN_SECTION'} = $LINTIAN_SECTION;
$ENV{'LINTIAN_ARCH'} = $LINTIAN_ARCH;
$ENV{'PATH'} = $LINTIAN_BIN_DIR . ':' . $ENV{'PATH'};
-unless ($LINTIAN_GPG_CHECK) {
- link '/bin/true', $LINTIAN_BIN_DIR . '/gpg'
- unless(-f $LINTIAN_BIN_DIR . '/gpg');
-} else {
+if ($LINTIAN_GPG_CHECK) {
if (-l $LINTIAN_BIN_DIR . '/gpg') {
unlink($LINTIAN_BIN_DIR . '/gpg');
} else {
rename($LINTIAN_BIN_DIR . '/gpg', $LINTIAN_BIN_DIR . '/gpg.bkp');
}
+} else {
+ symlink '/bin/true', $LINTIAN_BIN_DIR . '/gpg'
+ unless(-f $LINTIAN_BIN_DIR . '/gpg');
}
if ($opt_c) { # purge the old packages
--
Debian package checker
Reply to: