aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunichi Uekawa <dancer@netfort.gr.jp>2009-02-11 12:11:40 +0900
committerJunichi Uekawa <dancer@netfort.gr.jp>2009-02-11 12:11:40 +0900
commit1eab1c3ad28f35baf7cadd6e5883018ec6ec7b80 (patch)
treea8ec1404e16561edd439e35e7d1bca5731a8f77d
parent81a5ec1b474c16438daa93e634c911b695d2888f (diff)
downloadpbuilder-1eab1c3ad28f35baf7cadd6e5883018ec6ec7b80.tar
pbuilder-1eab1c3ad28f35baf7cadd6e5883018ec6ec7b80.tar.gz
Bug#514656: pbuilder: does not handle comments in debian/control correctly
Patch from Adeodato Simo.
-rwxr-xr-xpbuilder-satisfydepends-funcs1
-rwxr-xr-xtest_pbuilder-satisfydepends-funcs33
2 files changed, 34 insertions, 0 deletions
diff --git a/pbuilder-satisfydepends-funcs b/pbuilder-satisfydepends-funcs
index 0e8270c..bdbe0b1 100755
--- a/pbuilder-satisfydepends-funcs
+++ b/pbuilder-satisfydepends-funcs
@@ -60,6 +60,7 @@ get_control_re() {
/^$/ { source=0 }
/^Source:/ { source=1 }
/^[^ ]*:/ { p=0 }
+ /^#/ { next }
tolower($0) ~ /^'"$re"':/ { p=1 }
{ if (p && source) { print $0 } }' |
sed 's/^[^: ]*://'
diff --git a/test_pbuilder-satisfydepends-funcs b/test_pbuilder-satisfydepends-funcs
new file mode 100755
index 0000000..a245fc7
--- /dev/null
+++ b/test_pbuilder-satisfydepends-funcs
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+. ./testlib.sh
+. ./pbuilder-satisfydepends-funcs
+
+# testsuite to test pbuilder-satisfydepends-checkparams.
+
+test_get_control_re() {
+ CONTROL=$(tempfile)
+ cat <<EOF > "$CONTROL"
+Source: amule
+XXXX:
+Build-Depends:
+ autotools-dev,
+ debhelper,
+ quilt,
+##
+ libwxgtk2.8-dev,
+Build-Depends-Indep: test, test1
+Desctiption: test
+ other things
+ wow
+EOF
+ get_control_re "$CONTROL" "build-(depends|depends-indep)"
+}
+expect_output "
+ autotools-dev,
+ debhelper,
+ quilt,
+ libwxgtk2.8-dev,
+ test, test1" test_get_control_re
+
+testlib_summary