diff options
| author | Loïc Minier <lool@dooz.org> | 2010-03-15 14:14:30 +0100 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2010-03-15 14:14:30 +0100 |
| commit | a05aa5b51c9300cc765cf8ec11a05cb5d9cb9d96 (patch) | |
| tree | 9d94365b7da1b1f054c662e7683330cce83793a3 | |
| parent | 666882d08a5d2e846427f6a1765530911a95fbd2 (diff) | |
| download | pbuilder-a05aa5b51c9300cc765cf8ec11a05cb5d9cb9d96.tar pbuilder-a05aa5b51c9300cc765cf8ec11a05cb5d9cb9d96.tar.gz | |
Add test and fix for parsing of .dsc files
| -rwxr-xr-x | pbuilder-satisfydepends-funcs | 6 | ||||
| -rwxr-xr-x | test_pbuilder-satisfydepends-funcs | 26 |
2 files changed, 32 insertions, 0 deletions
diff --git a/pbuilder-satisfydepends-funcs b/pbuilder-satisfydepends-funcs index 72e0b5b..f4cae2d 100755 --- a/pbuilder-satisfydepends-funcs +++ b/pbuilder-satisfydepends-funcs @@ -55,6 +55,12 @@ get_source_control_field() { sed -n -e "s/^$field://i" -e ' t store +/^-----BEGIN PGP SIGNED MESSAGE-----$/ { + : pgploop + n + /^$/ d + b pgploop +} /^$/q d : store diff --git a/test_pbuilder-satisfydepends-funcs b/test_pbuilder-satisfydepends-funcs index b4854fc..4eaa665 100755 --- a/test_pbuilder-satisfydepends-funcs +++ b/test_pbuilder-satisfydepends-funcs @@ -50,6 +50,30 @@ EOF get_build_deps } +test_get_build_deps_dsc() { + cat <<EOF >"$DEBIAN_CONTROL" +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +Format: 1.0 +Source: hello-debhelper +Build-Depends: debhelper (>= 7) +Checksums-Sha1: + fcbf0264928900adf03a7797474375e1a6fa3836 499638 hello-debhelper_2.4.orig.tar.gz + 0ea70eb46b4c90a8dbefbe60bebe4b9f9abb2733 5308 hello-debhelper_2.4-3.diff.gz + + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJKml74AAoJEEHOfwufG4sysC4H/26EikyIgIqRuSXMiykc1hmd +97id9nWl+QzgCpUEg/+uDqEW+Bl6291FstGvzTFCwmB5JjH9ErH1LsyG1OLXbFUb +H89Em7qkl4o2ACTh255oM7FhVweof3UEaLCZMH+HZVVpHXNpEnhrfDvpTBbPGjUi +-----END PGP SIGNATURE----- +EOF + get_build_deps +} + trap cleanup sigpipe sighup exit # TODO move to build dir @@ -60,4 +84,6 @@ expect_output "autotools-dev (>= 1.2), debhelper, quilt (<< 12:0), libwxgtk2.8-d expect_output "autotools-dev (>= 1.2), debhelper, quilt (<< 12:0), libwxgtk2.8-dev" \ test_get_build_deps "yes" +expect_output "debhelper (>= 7)" test_get_build_deps_dsc + testlib_summary |