diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-01-20 17:26:36 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-01-20 17:26:36 -0500 |
| commit | 45633afa194774b40bcc3dc6b1219d3d84e2acbf (patch) | |
| tree | 97175245afb499a52cdbb48e79f0d1f942972a5f | |
| parent | 448f6fd2aa56e38cfddc9788d6fe2196b97c8daf (diff) | |
db-import-archlinux-src: Fail on both i686 and x86_64, not just x86_64.
The overly-clever control flow operators in sync_abs_libre() [I believe
mistakenly] only had the function fail if the _last_ iteration of the loop
failed, rather than any iteration.
| -rwxr-xr-x | db-import-archlinux-src | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/db-import-archlinux-src b/db-import-archlinux-src index ad4e4d4..b529f77 100755 --- a/db-import-archlinux-src +++ b/db-import-archlinux-src @@ -56,15 +56,16 @@ function sync_abs_libre() { # Sync from ABS and then sync from ABSLibre printf ":: Syncing ABSLibre...\t" - (rsync ${SYNCARGS} --delete-excluded \ - --exclude-from=${BLFILE} \ - ${ABSROOT} \ - ${ABSLIBRE} \ - && - for ARCH in i686 x86_64; do rsync -v -mrtq --no-motd --no-p --no-o --no-g --quiet --exclude=.git/ /tmp/abslibre/ ${ABSLIBRE}/${ARCH}/; done) || { + if ! rsync ${SYNCARGS} --delete-excluded --exclude-from=${BLFILE} ${ABSROOT} ${ABSLIBRE}; then printf "[FAILED]\n" return 1 - } + fi + for ARCH in i686 x86_64; do + if ! rsync -v -mrtq --no-motd --no-p --no-o --no-g --quiet --exclude=.git/ /tmp/abslibre/ ${ABSLIBRE}/${ARCH}/; then + printf "[FAILED]\n" + return 1 + fi + done # fix some permissions find "${ABSLIBRE}" -type d -print0 | xargs -0 chmod 755 |