aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-06-25 16:18:21 +0000
committerMattia Rizzolo <mattia@mapreri.org>2015-06-25 16:18:21 +0000
commitb046dd0cf01ab3cb82c86b88f1d27b67c7effc49 (patch)
tree6c27a90cbaa70c13c04b51915af7f9dd468de927
parenta78ed26bd9ed30f13d33c740183ff5d33527d553 (diff)
downloadpbuilder-b046dd0cf01ab3cb82c86b88f1d27b67c7effc49.tar
pbuilder-b046dd0cf01ab3cb82c86b88f1d27b67c7effc49.tar.gz
pbuilder-satisfydepends-fucs: allow blank lines above the first paragraph
Closes: #694404
-rwxr-xr-xpbuilder-satisfydepends-funcs5
-rwxr-xr-xtest_pbuilder-satisfydepends-funcs3
2 files changed, 7 insertions, 1 deletions
diff --git a/pbuilder-satisfydepends-funcs b/pbuilder-satisfydepends-funcs
index 651cbcc..0b955e3 100755
--- a/pbuilder-satisfydepends-funcs
+++ b/pbuilder-satisfydepends-funcs
@@ -62,6 +62,11 @@ t store
b pgploop
}
: leadloop
+/^[ \t]*$/ {
+ n
+ /^$/ d
+ b leadloop
+}
/^#/ {
n
/^$/ d
diff --git a/test_pbuilder-satisfydepends-funcs b/test_pbuilder-satisfydepends-funcs
index 14fbb53..b652f0a 100755
--- a/test_pbuilder-satisfydepends-funcs
+++ b/test_pbuilder-satisfydepends-funcs
@@ -77,7 +77,8 @@ EOF
test_get_source_control_field_with_comments() {
cat <<EOF >"$DEBIAN_CONTROL"
# This is a comment
-# So is this
+
+# So is this, but with a blank line above me
Format: 1.0
Source: something-funny
Build-Depends: debhelper, something-else