diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-06-09 11:55:30 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-06-09 11:55:30 +0100 |
| commit | fbcdf33f93149700a69bb588fdb7e9b4ea632037 (patch) | |
| tree | 2f6e5a0856b98e67b884ee4135b4797f050e5433 | |
| parent | 6a3d8a9600a8eabceaeae54bb0394d89ff9372fa (diff) | |
git.sh: download xtree *before*, not after
downloading it after means that if an error occurs
when downloading the xtree project, the main project
will still be there and nothing will mandate the
downloading of the xtree project. whereas, if we
grab the xtree project first, then the main project
won't get saved to src/
this makes the build system a bit more resilient under
fault conditions, but otherwise doesn't change behaviour.
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rwxr-xr-x | include/git.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git.sh b/include/git.sh index 71dd61a1..cd0dffa5 100755 --- a/include/git.sh +++ b/include/git.sh @@ -56,6 +56,8 @@ fetch_project_repo() [ -z "${loc+x}" ] && $err "fetch_project_repo $project: loc not set" [ -z "${url+x}" ] && $err "fetch_project_repo $project: url not set" + [ -n "$xtree" ] && [ ! -d "src/coreboot/$xtree" ] && \ + x_ ./update trees -f coreboot "$xtree" [ -z "$depend" ] || for d in $depend ; do printf "'%s' needs dependency '%s'; grabbing '%s' now\n" \ "$project" "$d" "$d" @@ -172,8 +174,6 @@ move_repo() { [ "$1" = "${1%/*}" ] || x_ mkdir -p "${1%/*}" mv "$tmpgit" "$1" || $err "git_prep: !mv $tmpgit $1" - [ -n "$xtree" ] && [ ! -d "src/coreboot/$xtree" ] && \ - x_ ./update trees -f coreboot "$xtree"; return 0 } # can delete from multi- and single-tree projects. |