[MERGED] osmo-ci[master]: osmo-deps.sh: make sure to not clean all deps when inside a ...

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Sat Oct 28 02:23:27 UTC 2017


Neels Hofmeyr has submitted this change and it was merged.

Change subject: osmo-deps.sh: make sure to not clean all deps when inside a dep dir
......................................................................


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
---
M scripts/osmo-deps.sh
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved; Verified



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 @@
 
 # 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

-- 
To view, visit https://gerrit.osmocom.org/4491
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I431d20aedefc708645a1f1862334cffaef20b928
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>


More information about the gerrit-log mailing list