danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

checkout: output better debug info

Browse source
This commit is contained in:
Graham Christensen 2017-10-31 04:06:50 -04:00
parent b8657250dd
commit fd7ec20a6a
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Checkout.php
View file

@ -20,7 +20,7 @@ class Checkout {
$guard = $this->guard($bname); $guard = $this->guard($bname);
if (!is_dir($bname)) { if (!is_dir($bname)) {
echo "Cloning " . $id . " to $bname\n"; echo "Cloning https://github.com/" . $repo_name . "/pull/" . $id . " to $bname\n";
Exec::exec('git clone --reference-if-able %s %s %s', Exec::exec('git clone --reference-if-able %s %s %s',
[ [
$pname, $pname,
@ -33,7 +33,7 @@ class Checkout {
throw new CoFailedException("Failed to chdir to $bname\n"); throw new CoFailedException("Failed to chdir to $bname\n");
} }
echo "fetching " . $id . " in $bname\n"; echo "fetching https://github.com/" . $repo_name . "/pull/" . $id . " in $bname\n";
Exec::exec('git fetch origin'); Exec::exec('git fetch origin');
try { try {
Exec::exec('git am --abort'); Exec::exec('git am --abort');
@ -53,7 +53,7 @@ class Checkout {
throw new CoFailedException("Failed to chdir to $bname\n"); throw new CoFailedException("Failed to chdir to $bname\n");
} }
$guard = $this->guard($pname); $guard = $this->guard($bname);
Exec::exec('curl -L %s | git am --no-gpg-sign -', [$patch_url]); Exec::exec('curl -L %s | git am --no-gpg-sign -', [$patch_url]);
$this->release($guard); $this->release($guard);
} }
@ -82,7 +82,7 @@ class Checkout {
throw new CoFailedException("Failed to chdir to $pname"); throw new CoFailedException("Failed to chdir to $pname");
} }
echo "Fetching $name to $pname\n"; echo "Fetching $name in $pname\n";
Exec::exec('git fetch origin'); Exec::exec('git fetch origin');
} }
@ -99,11 +99,13 @@ class Checkout {
} }
function guard($path) { function guard($path) {
echo "about to lock $path\n";
$res = fopen("$path.lock", 'c'); $res = fopen("$path.lock", 'c');
while (!flock($res, LOCK_EX)) { while (!flock($res, LOCK_EX)) {
echo "waiting for lock on $path...\n"; echo "waiting for lock on $path...\n";
sleep(1); sleep(1);
} }
echo "got lock on $path\n";
return $res; return $res;
} }