Skip to content

Commit 622cbef

Browse files
committed
Merge branch 'master' into compat5
* master: Improve messaging for locked dependency path
2 parents d8c54ac + c7c874e commit 622cbef

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

lib/php/libsdk/SDK/Build/Dependency/Manager.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ public function performUpdate(string &$msg = NULL, bool $force = false, bool $ba
5151
return;
5252
}
5353

54-
$lock = new Lock(Config::getDepsLocalPath(), false);
55-
if (!$lock->exclusive()) {
56-
$msg .= "Another process is updating same dependency path. I'm just going to wait for it to finish and then exit.";
54+
$lock = new Lock(Config::getDepsLocalPath());
55+
if (!$lock->locked()) {
56+
$msg .= "Dependencies was updated by another process.";
57+
echo "Another process is updating same dependency path. I'm just going to wait for it to finish and then exit.", PHP_EOL;
5758
$lock->exclusive(true);
5859
unset($lock);
5960
return;

0 commit comments

Comments
 (0)