From 7a1fec2c26ddf238966e27ed3beb3b3038ba7263 Mon Sep 17 00:00:00 2001 From: udeved Date: Fri, 3 Jul 2015 20:30:46 +0200 Subject: [PATCH] [util-iso-image] fix #78 add return value so download_to_cache() can error out on get pkg fail --- lib/util-iso-image.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh index a0b223c..0bc00bc 100644 --- a/lib/util-iso-image.sh +++ b/lib/util-iso-image.sh @@ -386,20 +386,28 @@ make_repo(){ # $1: work dir # $2: pkglist download_to_cache(){ + local ret=$? chroot-run \ -r "${mountargs_ro}" \ -w "${mountargs_rw}" \ -B "${build_mirror}/${branch}" \ "$1" \ pacman -v -Syw $2 --noconfirm + if [[ $ret == 1 ]];then + ret=1 + fi chroot-run \ -r "${mountargs_ro}" \ -w "${mountargs_rw}" \ -B "${build_mirror}/${branch}" \ "$1" \ pacman -v -Sp $2 --noconfirm > "$1"/cache-packages.txt + if [[ $ret == 1 ]];then + ret=1 + fi sed -ni '/.pkg.tar.xz/p' "$1"/cache-packages.txt sed -i "s/.*\///" "$1"/cache-packages.txt + return $ret } # $1: image path