diff options
author | Justin Boffemmyer | 2018-02-21 11:36:36 +0900 |
---|---|---|
committer | Justin Boffemmyer | 2018-02-21 11:36:36 +0900 |
commit | 402116d48b063bcb80aaf7bbf8d25749bee62e40 (patch) | |
tree | ad9fc1a68131393690464e51347019c02b3603ac | |
parent | cbf4b615351328cf33f1b4397b03616b1d6e1424 (diff) |
cauldron: lib.toolchain: workaround for url dl
Somehow, liberror_check is picking up an error code when it gets called, even
though manually running the url dl results in no error. Adding extra ||
conditionals between the url dl commands and the following liberror_check calls
alleviates the problem.
-rw-r--r-- | cauldron/lib/lib.toolchain | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cauldron/lib/lib.toolchain b/cauldron/lib/lib.toolchain index 5e05549..a62fa3c 100644 --- a/cauldron/lib/lib.toolchain +++ b/cauldron/lib/lib.toolchain @@ -141,14 +141,14 @@ function cauldron_toolchain_baseroot() { # get a fresh basesystem chroot package ( cd "$CAULDRON_TMP" - "${CAULDRON_CMD_URL_DL[@]}" "$baseroot_url" - liberror_check $ERR_TOOLCHAIN_BASEROOT \ - "could not acquire baseroot image file" || - return $ERR_TOOLCHAIN_BASEROOT - "${CAULDRON_CMD_URL_DL[@]}" "$baseroot_sig" - liberror_check $ERR_TOOLCHAIN_BASEROOT \ - "could not acquire baseroot signature file" || - return $ERR_TOOLCHAIN_BASEROOT + "${CAULDRON_CMD_URL_DL[@]}" "$baseroot_url" || + liberror_check $ERR_TOOLCHAIN_BASEROOT \ + "could not acquire baseroot image file" || + return $ERR_TOOLCHAIN_BASEROOT + "${CAULDRON_CMD_URL_DL[@]}" "$baseroot_sig" || + liberror_check $ERR_TOOLCHAIN_BASEROOT \ + "could not acquire baseroot signature file" || + return $ERR_TOOLCHAIN_BASEROOT ) liberror_check || return $? fi |