summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2016-04-06 22:41:21 +0200
committerErich Eckner <git@eckner.net>2016-04-11 11:29:19 +0200
commit354be461adadd0baa483b3a6dbae54eb4e2e526b (patch)
tree2de79af45f7edbe9a46e8cad97d76e2cc87a7881
parent9437a04e924bcd7caa8a2cd0a937a164bad25e84 (diff)
downloadarchlinuxewe-354be461adadd0baa483b3a6dbae54eb4e2e526b.tar.xz
bei ignorierten Fehlern db trotzdem neu erzeugen
-rwxr-xr-xarchPackagesUpdate17
1 files changed, 9 insertions, 8 deletions
diff --git a/archPackagesUpdate b/archPackagesUpdate
index bda7688bc..2b611eac1 100755
--- a/archPackagesUpdate
+++ b/archPackagesUpdate
@@ -142,7 +142,7 @@ done
if ${aufRechenknecht}
then
sudo pacman -Syy
- err=0
+ maxErr=0
# build packages
for ((i=0; i<${#pakete[@]}; i++))
@@ -159,17 +159,17 @@ then
# 32-bit is built in chroot
echo 'cd "'"${tmpDir}/${paket}"'" && makepkg -fcsr --noconfirm && exit' | \
chrootUnpriv
- tmpErr=$?
+ err[${i}]=$?
else
# everything else is built directly
makepkg -fcsr --noconfirm
- tmpErr=$?
+ err[${i}]=$?
fi
- ${abortOnMakepkgError} && [ ${tmpErr} -ne 0 ] && exit ${tmpErr}
- [ ${tmpErr} -gt ${err} ] && err=${tmpErr}
+ ${abortOnMakepkgError} && [ ${err[${i}]} -ne 0 ] && exit ${err[${i}]}
+ [ ${err[${i}]} -gt ${maxErr} ] && maxErr=${err[${i}]}
# upload packages
- if ${upload} && [ ${tmpErr} -eq 0 ]
+ if ${upload} && [ ${err[${i}]} -eq 0 ]
then
scp ${tmpDir}/${paket}/${paket}-${vers}-${arch}.pkg.tar.xz paule@127.0.0.1:${pkgDir}/${arch}/
[ "${arch}" == "any" ] && ssh paule@127.0.0.1 '\
@@ -185,13 +185,12 @@ then
fi
done
- [ ${err} -ne 0 ] && exit ${err}
-
# update packagedb
if ${upload}
then
for ((i=0; i<${#pakete[@]}; i++))
do
+ [ ${err[${i}]} == 0 ] || continue
echo "${pakete[${i}]}"
echo "${verss[${i}]}"
echo "${archs[${i}]}"
@@ -236,6 +235,8 @@ then
'
fi
+ [ ${maxErr} -ne 0 ] && exit ${maxErr}
+
else
# check packages