diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-10-28 04:19:23 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-10-28 04:19:23 +0200 |
| commit | 63509531701138f9454f9c3505ceb435b6cf9e06 (patch) | |
| tree | 3d80e4126c17fa07a36e349db96d0bbd68196169 /scripts/osmo-deps.sh | |
| parent | f9c1cb2777cfc2241a51749ea126dfd1f02276be (diff) | |
osmo-deps.sh: make sure to not clean all deps when inside a dep dir
Make sure osmo-deps.sh passes no $deps in to osmo-clean-workspace.sh.
In most builds, $deps is a relative path, and when within a dir that contains
no such subir, calling osmo-clean-workspace.sh has no effect. However, in some,
$deps is passed in as absolute path, so when within a deps/... subdir in
osmo-deps.sh, the script would still find the abspath and clean out all deps
subdirs; for example in osmo-bts.
Change-Id: I431d20aedefc708645a1f1862334cffaef20b928
Diffstat (limited to 'scripts/osmo-deps.sh')
| -rwxr-xr-x | scripts/osmo-deps.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/osmo-deps.sh b/scripts/osmo-deps.sh index 74de22b..0610037 100755 --- a/scripts/osmo-deps.sh +++ b/scripts/osmo-deps.sh @@ -13,8 +13,8 @@ git fetch origin # Cleanup should already have happened during a global osmo-clean-workspace.sh, # but in case the caller did not (want to) call that, let's also do cleanup in -# the dep subdir separately: -osmo-clean-workspace.sh +# this dep subdir separately, making sure to not pass in $deps as abspath. +deps="" osmo-clean-workspace.sh git checkout -f "$branch" git rev-parse HEAD |