diff options
author | Sasha Levin <sasha.levin@oracle.com> | 2015-11-15 21:26:50 -0500 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-11-15 21:26:50 -0500 |
commit | 98eec9e341386480fbb40e45bb41302f3ed035cf (patch) | |
tree | 913920fb441cbf75b962d6299a3a83ea33024aa8 | |
parent | 252e2841c18ec0b8fadfa1758eb7ec3a4b67ff44 (diff) | |
download | stable-tools-98eec9e341386480fbb40e45bb41302f3ed035cf.tar.gz |
check_relevant: fix the fixes commit in-tree check
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-rw-r--r-- | common | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -10,8 +10,13 @@ function check_relevant { # If this commit fixes anything, but the broken commit isn't in our branch we don't # need this commit either. - if [ "$fixescmt" != "" ] && [ "$(stable-commit-in-tree $fixescmt)" = "1" ]; then - return 0 + if [ "$fixescmt" != "" ]; then + stable-commit-in-tree $fixescmt + if [ $? -eq 1 ]; then + return 1 + else + return 0 + fi fi # Let's see if there's a version tag in this commit @@ -33,14 +38,14 @@ function check_relevant { # If the version tag is for a major version newer than ours if [ "$STABLE_MAJ_VER" -lt "$maj" ]; then - return 1 + return 0 fi # Or if the overall version is newer than ours if [ "$STABLE_MAJ_VER" -eq "$maj" ] && [ "$STABLE_MIN_VER" -lt "$min" ]; then - return 1 + return 0 fi # No version tag, unsure, or version tag is older than ours - return 0 + return 1 } |