diff --git a/scripts/build-in-docker.sh b/scripts/build-in-docker.sh index fc13547..4fc1652 100755 --- a/scripts/build-in-docker.sh +++ b/scripts/build-in-docker.sh @@ -113,7 +113,6 @@ function traperror() { fi echo fi - echo "**** Entering docker container ${DOCKER_ID}, exit with Ctrl-D" echo -n " ... cleanup docker: " docker rm -f "${DOCKER_ID}" echo "returning status: $e" diff --git a/scripts/resolve-debbuilddeps.sh b/scripts/resolve-debbuilddeps.sh index 1fd672c..ecd5522 100755 --- a/scripts/resolve-debbuilddeps.sh +++ b/scripts/resolve-debbuilddeps.sh @@ -35,7 +35,7 @@ TO_INSTALL= if test -e debian/control.in -a ! -e debian/control; then for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do - if test -n "$(${DO} apt-cache policy -q ${f})" && ! ${DO} dpkg -l "${f}"; then + if test -n "$(${DO} apt-cache policy -q ${f})" && ! "$(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')" && ! ${DO} dpkg -l "${f}"; then TO_INSTALL+=" ${f}" fi done