From 5b370ec68d04f4069227ab43b8918ed2ec12a7f8 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 22 May 2018 13:12:46 +0200 Subject: [PATCH] prefer `apt-get build-dep` if the current Debian version works --- gitlab-ci-git-buildpackage | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gitlab-ci-git-buildpackage b/gitlab-ci-git-buildpackage index 901fd6b..35d6568 100755 --- a/gitlab-ci-git-buildpackage +++ b/gitlab-ci-git-buildpackage @@ -15,9 +15,12 @@ if [[ ! -f $lockfile ]] ; then apt-get -qy dist-upgrade cd $CI_PROJECT_DIR - export BUILD_DEPENDS=`sed 's/\s*|[^,]*,/,/g' debian/control | perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p'` - apt-get -qy install --no-install-recommends \ - build-essential dpkg-dev fakeroot git-buildpackage pristine-tar $BUILD_DEPENDS + if ! apt-get -qy build-dep $CI_PROJECT_DIR; then + # this is running on an older version, like jessie-backports + export BUILD_DEPENDS=`sed 's/\s*|[^,]*,/,/g' debian/control | perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p'` + apt-get -qy install --no-install-recommends \ + build-essential dpkg-dev fakeroot git-buildpackage pristine-tar $BUILD_DEPENDS + fi apt-get -qy autoremove --purge dpkg-checkbuilddeps echo "ensure pristine-tar branch exists and is current"