aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-07-10 20:51:36 +0000
committerMattia Rizzolo <mattia@mapreri.org>2015-07-10 21:09:51 +0000
commit0482aa91ae30bdb67dfa4a916383c9eae1c4891a (patch)
tree823f697d9093c0b3d160b5ccd7f5da3ea93b9014
parent4e6503249dc64810cb6d88552a8799f0803c4f63 (diff)
downloadpbuilder-0482aa91ae30bdb67dfa4a916383c9eae1c4891a.tar
pbuilder-0482aa91ae30bdb67dfa4a916383c9eae1c4891a.tar.gz
pbuilder-satisfydepends-funcs: fix a case where a "strictly earlier" reletionship was considered a build profile (and as a result the build-dep vanished)
Yes, this is not really a fix. Yes, I'd really love to fix the original regexp. Yes, *this will not stay here forever* (you have to exercise your doublethink!) Closes: #791991 Gbp-Dch: Short
-rwxr-xr-xpbuilder-satisfydepends-funcs4
-rwxr-xr-xtest_pbuilder-satisfydepends-funcs36
2 files changed, 40 insertions, 0 deletions
diff --git a/pbuilder-satisfydepends-funcs b/pbuilder-satisfydepends-funcs
index 0b955e3..da226a1 100755
--- a/pbuilder-satisfydepends-funcs
+++ b/pbuilder-satisfydepends-funcs
@@ -235,6 +235,10 @@ checkbuilddep_restrictiondeps() {
local PROFILE
local NEGATED
local FOUND
+ if [ "$DEP_RESTRICTIONS" = "$INSTALLPKG" ]; then
+ # there is not a build profile, rather it's a version costraint
+ return 1
+ fi
IFS=';' read -ra RESTRLISTS <<< "$DEP_RESTRICTIONS"
for restrlist in "${RESTRLISTS[@]}"; do
SEEN_PROFILE="yes"
diff --git a/test_pbuilder-satisfydepends-funcs b/test_pbuilder-satisfydepends-funcs
index b652f0a..9cfc7f2 100755
--- a/test_pbuilder-satisfydepends-funcs
+++ b/test_pbuilder-satisfydepends-funcs
@@ -74,6 +74,41 @@ EOF
get_build_deps
}
+test_get_parsed_build_deps_dsc() {
+ local ARCH="amd64"
+ local BINARY_ARCH="no"
+
+ cat > "$DEBIAN_CONTROL" << EOF
+Format: 3.0 (quilt)
+Source: haskell-concrete-typerep
+Binary: libghc-concrete-typerep-dev, libghc-concrete-typerep-prof, libghc-concrete-typerep-doc
+Architecture: any all
+Version: 0.1.0.2-4
+Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
+Uploaders: Masayuki Hatta (mhatta) <mhatta@debian.org>
+Homepage: http://hackage.haskell.org/package/concrete-typerep
+Standards-Version: 3.9.3
+Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-concrete-typerep
+Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-concrete-typerep
+Build-Depends: debhelper (>= 9), haskell-devscripts (>= 0.9), cdbs, ghc, ghc-prof, libghc-hashable-dev (<< 1.3), libghc-hashable-prof (<< 1.3)
+Build-Depends-Indep: ghc-doc, libghc-hashable-doc (<< 1.3)
+Package-List:
+ libghc-concrete-typerep-dev deb haskell extra arch=any
+ libghc-concrete-typerep-doc deb doc extra arch=all
+ libghc-concrete-typerep-prof deb haskell extra arch=any
+Checksums-Sha1:
+ 7dc356eef28c83f606b792e3d39b68a04c1a6d98 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz
+ a5b34d7dd7f1ef42b0afad86140efcd6997d09c1 2272 haskell-concrete-typerep_0.1.0.2-4.debian.tar.xz
+Checksums-Sha256:
+ f72a41d9d8315528c7b0e13bf61e6122c7d236cb529c207cfb431cf272439e1f 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz
+ 09dcedfef76799dcb3c6a9e22bc22711050cc56769614bdbf61b426579ce10e5 2272 haskell-concrete-typerep_0.1.0.2-4.debian.tar.xz
+Files:
+ 5638a296661fb65145dfbc062cfa53db 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz
+ 706754d44fac13c25e1ee8dd89180c53 2272 haskell-concrete-typerep_0.1.0.2-4.debian.tar.xz
+EOF
+ get_build_deps | filter_arch_deps "$ARCH" | filter_restriction_deps "$DEB_BUILD_PROFILES"
+}
+
test_get_source_control_field_with_comments() {
cat <<EOF >"$DEBIAN_CONTROL"
# This is a comment
@@ -164,6 +199,7 @@ expect_output "foo" test_filter_arch_restriction_deps "foo [amd64] <!stage1>" "a
expect_output "" test_filter_arch_restriction_deps "foo [i386] <stage1>" "amd64" "stage1"
expect_output "debhelper (>= 7)" test_get_build_deps_dsc
+expect_output "debhelper (>= 9), haskell-devscripts (>= 0.9), cdbs, ghc, ghc-prof, libghc-hashable-dev (<< 1.3), libghc-hashable-prof (<< 1.3), ghc-doc, libghc-hashable-doc (<< 1.3)" test_get_parsed_build_deps_dsc
expect_output "something-funny" test_get_source_control_field_with_comments