Package: pbuilder
Version: 0.186
Severity: normal
Tags: patch
Accidentally stepped into F<debian/control> with funny wrappings.
Namely B<libmodule-scandeps-perl>, version 0.89-1. Offending lines are:
Build-Depends-Indep: perl (>= 5.8.0-7), perl-modules (>= 5.10.0) |
libmodule-build-perl (>= 0.28), libversion-perl, libtest-pod-perl,
libmodule-pluggable-perl, libprefork-perl
That finishes build with
Package: pbuilder-satisfydepends-dummy
Version: 0.invalid.0
Architecture: i386
Maintainer: Debian Pbuilder Team
<pbuilder-ma...@lists.alioth.debian.org>
Description: Dummy package to satisfy dependencies with aptitude -
created by pbuilder
This package was created automatically by pbuilder and should
Depends: debhelper (>= 7), quilt (>= 0.40), perl (>= 5.8.0-7),
perl-modules (>= 5.10.0) |, libmodule-build-perl (>= 0.28), libversion-perl,
libtest-pod-perl, libmodule-pluggable-perl, libprefork-perl
dpkg-deb: parse error, in file
`/tmp/satisfydepends-aptitude/pbuilder-satisfydepends-dummy/DEBIAN/control'
near line 7 package `pbuilder-satisfydepends-dummy':
`Depends' field, missing package name, or garbage where package name
expected
Copying back the cached apt archive contents
Please note C<|,> between B<perl-modules> and B<libmodule-build-perl>.
I'd thought a lot of this and have found that only reliable place to fix
it is inside B<get_control_re> function of
F<pbuilder-satisfydepends-funcs>. Look, after stripping headers it
would be error prone to recreate records. Bugfix in attach.
-- System Information:
Debian Release: 5.0
APT prefers testing
APT policy: (700, 'testing'), (700, 'stable'), (1, 'testing'), (1, 'stable')
Architecture: i386 (i686)
Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=ru_UA.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -ur pbuilder-0.186/pbuilder-satisfydepends-funcs pbuilder-0.186+nmu3/pbuilder-satisfydepends-funcs
--- pbuilder-0.186/pbuilder-satisfydepends-funcs 2009-02-11 05:01:46.000000000 +0200
+++ pbuilder-0.186+nmu3/pbuilder-satisfydepends-funcs 2009-03-10 19:03:29.000000000 +0200
@@ -63,6 +63,11 @@
/^#/ { next }
tolower($0) ~ /^'"$re"':/ { p=1 }
{ if (p && source) { print $0 } }' |
+ awk '
+ /^[^ ]*:/ && length(s) { print s }
+ /^[^ ]*:/ { s="" }
+ { s=s $0 }
+ END { print s }' |
sed 's/^[^: ]*://'
}
diff -ur pbuilder-0.186/test_pbuilder-satisfydepends-funcs pbuilder-0.186+nmu3/test_pbuilder-satisfydepends-funcs
--- pbuilder-0.186/test_pbuilder-satisfydepends-funcs 2009-02-11 05:11:02.000000000 +0200
+++ pbuilder-0.186+nmu3/test_pbuilder-satisfydepends-funcs 2009-03-10 19:23:13.000000000 +0200
@@ -23,11 +23,7 @@
EOF
get_control_re "$CONTROL" "build-(depends|depends-indep)"
}
-expect_output "
- autotools-dev,
- debhelper,
- quilt,
- libwxgtk2.8-dev,
+expect_output " autotools-dev, debhelper, quilt, libwxgtk2.8-dev,
test, test1" test_get_control_re
testlib_summary
