diff options
Diffstat (limited to 'src/build/tools')
| -rwxr-xr-x | src/build/tools/hbRelease | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/build/tools/hbRelease b/src/build/tools/hbRelease index ba851756d..898c2bbac 100755 --- a/src/build/tools/hbRelease +++ b/src/build/tools/hbRelease @@ -2137,15 +2137,6 @@ sub gerrit_query_commit my $project = config_project(); - #Temporary Hack to look for commit in master branch if not found in - # release-fips920 - if (($project eq "hostboot") and $globals{"branch"} eq "release-fips920") - { - print "Automatically searching for $commit in $project/$globals{\"branch\"} \n" if $debug; - # Force next iteration to look for master branch - $globals{"branch"}="master"; - gerrit_query_commit($commit); - } my $query_result = gerrit_query("$commit project:$project ". "branch:".$globals{"branch"}); @@ -2168,6 +2159,20 @@ sub gerrit_query_commit } } } + + #Temporary Hack to look for commit in master branch if not found in + # release-fips920 + if (($project eq "hostboot") and $globals{"branch"} eq "release-fips920") + { + print "Cannot find $commit in $project/$globals{\"branch\"} \n" if $debug; + # Force next iteration to look for master branch + $globals{"branch"}="master"; + gerrit_query_commit($commit); + } + else + { + die "Cannot find $commit in $project/$globals{\"branch\"}"; + } } # sub gerrit_is_patch |
