FS-7338 fix when the build system was deleting the keyring before it was fully finished with it.

This commit is contained in:
William King 2015-06-15 15:17:18 -07:00
parent 538c28afea
commit 95a941759c

8
debian/util.sh vendored
View File

@ -322,10 +322,6 @@ build_debs () {
--othermirror "$(get_mirrors $distro $custom_sources_file)" --othermirror "$(get_mirrors $distro $custom_sources_file)"
fi fi
} }
if [ ! -e "$custom_keyring" ]; then
# Cleanup script created temporary file
rm -f $keyring
fi
if ! [ -d $cow_img ]; then if ! [ -d $cow_img ]; then
announce "Creating base $distro-$arch image..." announce "Creating base $distro-$arch image..."
local x=30 local x=30
@ -351,6 +347,10 @@ build_debs () {
--hookdir "$hookdir" \ --hookdir "$hookdir" \
--buildresult ../ \ --buildresult ../ \
$cow_build_opts $cow_build_opts
if [ ! -e "$custom_keyring" ]; then
# Cleanup script created temporary file
rm -f $keyring
fi
} 1>&2 } 1>&2
echo ${dsc%.dsc}_${arch}.changes echo ${dsc%.dsc}_${arch}.changes
} }