diff options
| author | fanquake <fanquake@gmail.com> | 2021-06-09 09:08:32 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-06-09 09:09:38 +0800 |
| commit | 7cac26246a23b2843cb368fe8a68c54dde04d5d8 (patch) | |
| tree | 73609c61111f49afd9ce94965082edd91f9b82c4 /contrib/guix/libexec/build.sh | |
| parent | 82bc7faec8079b50f248655a97950087948f065d (diff) | |
| parent | 108a6be92adc1e80839d90b552e72b8142140f6c (diff) | |
| download | bitcoin-7cac26246a23b2843cb368fe8a68c54dde04d5d8.tar.xz | |
Merge bitcoin/bitcoin#22075: guix: Misc leftover usability improvements
108a6be92adc1e80839d90b552e72b8142140f6c guix: Check for disk space availability before building (Carl Dong)
d7dec89091ee4a456ff64ad7ce675ae6813668f1 guix: Remove dest if OUTDIR mv fails (Carl Dong)
Pull request description:
There seems to be some corner cases that can be hit when guix scripts unexpectedly fail in the middle of operation, see: https://gnusha.org/bitcoin-builds/2021-05-24.log
- Perform an early disk space check for `guix-build`
- Overwrite existing output directory after a successful build (the existing one might be malformed), and cleanup output directory if the `mv` somehow fails
ACKs for top commit:
laanwj:
Tested ACK 108a6be92adc1e80839d90b552e72b8142140f6c
achow101:
ACK 108a6be92adc1e80839d90b552e72b8142140f6c
Tree-SHA512: cf6438317da40bf55714cd2d8cce859b3d435cc66cabefe8d4a53552d7880966acfe84ffe8fadf1c80e368ae6b037992258a6d409df85ffc6ce8bf780e98e2e5
Diffstat (limited to 'contrib/guix/libexec/build.sh')
| -rwxr-xr-x | contrib/guix/libexec/build.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 46bfa29b74..3073b41baf 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -447,4 +447,6 @@ mkdir -p "$DISTSRC" esac ) # $DISTSRC -mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" +rm -rf "$ACTUAL_OUTDIR" +mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" \ + || ( rm -rf "$ACTUAL_OUTDIR" && exit 1 ) |