Commit 3c1385e7 authored by Robert Lyon's avatar Robert Lyon

Checking if the patch (or parent) has been abandonded

And alerting user to the problem
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent aea11946
...@@ -21,6 +21,11 @@ if ($content[0]->status == 'MERGED') { ...@@ -21,6 +21,11 @@ if ($content[0]->status == 'MERGED') {
exit; exit;
} }
if ($content[0]->status == 'ABANDONED') {
echo 4;
exit;
}
// Check that the patch we are testing is the latest (current) patchset in series // Check that the patch we are testing is the latest (current) patchset in series
if ($content[0]->current_revision != $git_commit_id) { if ($content[0]->current_revision != $git_commit_id) {
echo 3; echo 3;
......
...@@ -38,6 +38,9 @@ do ...@@ -38,6 +38,9 @@ do
elif [ "$outcome" = "3" ]; then elif [ "$outcome" = "3" ]; then
echo "The patch with git commit id $line is not the latest (current) patch" echo "The patch with git commit id $line is not the latest (current) patch"
exit 1; exit 1;
elif [ "$outcome" = "4" ]; then
echo "This patch or a parent patch has been abandoned"
exit 1;
else else
echo "The patch with git commit id $line looks ok so we will continue" echo "The patch with git commit id $line looks ok so we will continue"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment