Merge pull request #13752 from tianon/fix-release-debs

Fix release script to release _both_ .deb files
Upstream-commit: cd1a1ee9729f76789194a5b5f6dcbc7fa7282420
Component: engine

components/engine/hack/release.sh

@@ -251,9 +251,10 @@ release_ubuntu() {
 		exit 1
 	}
 
+	local debfiles=( "bundles/$VERSION/ubuntu/"*.deb )
+
 	# Sign our packages
-	dpkg-sig -g "--passphrase $GPG_PASSPHRASE" -k releasedocker \
-		--sign builder "bundles/$VERSION/ubuntu/"*.deb
+	dpkg-sig -g "--passphrase $GPG_PASSPHRASE" -k releasedocker --sign builder "${debfiles[@]}"
 
 	# Setup the APT repo
 	APTDIR=bundles/$VERSION/ubuntu/apt
@@ -266,8 +267,7 @@ Architectures: amd64 i386
 EOF
 
 	# Add the DEB package to the APT repo
-	DEBFILE=( bundles/$VERSION/ubuntu/lxc-docker*.deb )
-	reprepro -b "$APTDIR" includedeb docker "$DEBFILE"
+	reprepro -b "$APTDIR" includedeb docker "${debfiles[@]}"
 
 	# Sign
 	for F in $(find $APTDIR -name Release); do