From b64f8968e492389c1bb8f0bdd62ee64aa18b30d0 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 23 Jan 2014 21:34:32 +0100 Subject: [PATCH] MT#5709 Do not ignore files without gbp inside the filename Otherwise files like ngcp-installer-ce_0.13.0~20140117133338.395+wheezy_all.deb as being the result of an UNRELEASED entry in the debian/changelog are ignored. dpkg-scanpackages is supposed to recognize the 0.10.2+0~1368529812.299+wheezy~1.gbp1691a0 being newer than 0.10.2 anyway. --- deployment.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/deployment.sh b/deployment.sh index f8f7325..81f411f 100755 --- a/deployment.sh +++ b/deployment.sh @@ -1050,14 +1050,7 @@ if "$NGCP_INSTALLER" ; then else echo "Found $DEBIAN_RELEASE specific packages, getting rid of all packages without gbp and $DEBIAN_RELEASE in their name." logit "Found $DEBIAN_RELEASE specific packages, getting rid of all packages without gbp and $DEBIAN_RELEASE in their name." - # inside the pool there might be versions which have been released inside a - # maintenance branch but which don't cover recent changes in trunk, - # therefore get rid of every file without "gbp" in the filename, so e.g. - # ngcp-installer-pro_0.10.2+0~1368529812.299+wheezy~1.gbp1691a0_all.deb (trunk version) - # is preferred over - # ngcp-installer-pro_0.10.2_all.deb (release in 2.8 repository) - find ./debs -type f -a ! -name \*gbp\* -exec rm {} + - # same for files not matching the Debian relase we want to install + # get rid of files not matching the Debian relase we want to install find ./debs -type f -a ! -name \*\+${DEBIAN_RELEASE}\* -exec rm {} + fi