[SCM] Debian package checker branch, master, updated. 2.0.0-rc2-7-gbf0a6a3
The following commit has been merged in the master branch:
commit 54ebf82fa6286e77dfc8856218157de7ac70707d
Author: Frank Lichtenheld <djpig@debian.org>
Date: Fri Sep 26 17:59:18 2008 +0200
frontend/lintian: Fix config file parsing which I completly broke in f7ef97e3
Pity that we don't test this and do not use a config file for harness.
diff --git a/debian/changelog b/debian/changelog
index f2994b8..a57d763 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ lintian (2.0.0) UNRELEASED; urgency=low
+ [ADB] Detect brace expansions with either a leading or trailing
blank component (e.g. "{foo,}"). Thanks to Jonny Lamb for pointing
this out.
+
+ * frontend/lintian:
+ + [FL] Fix config file parsing which I completly broke in ~rc1.
* man/lintian.1:
+ [FL] Remove a stray backslash.
diff --git a/frontend/lintian b/frontend/lintian
index 789b87f..98418f8 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -553,9 +553,9 @@ if ($LINTIAN_CFG) {
s,\~/,$ENV{'HOME'}/,go;
my $found = 0;
- foreach (VARS) {
+ foreach my $var (VARS) {
no strict 'refs';
- my $var = "LINTIAN_$_";
+ $var = "LINTIAN_$var";
if (m/^\s*$var\s*=\s*(.*\S)\s*$/i) {
$$var = $1;
$found = 1;
@@ -563,8 +563,7 @@ if ($LINTIAN_CFG) {
}
}
unless ($found) {
- die("syntax error in configuration file: $_",
- "(Note, that the syntax of the configuration file has been changed\nwith Lintian v0.3.0. In most cases, you don't need a configuration\nfile anymore -- just remove it.)");
+ die "syntax error in configuration file: $_\n";
}
}
close(CFG);
--
Debian package checker
Reply to: