Force hbRelease to search 'master' branch

  - There was a situation where first searching for
    release-fips920 would find a commit, but with a different
    number of patchsets and would cause errors.

Change-Id: Ie8c86e446a993b4e7d80459eb1398b321b640c62
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59778
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Tested-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

1 files changed, 9 insertions, 14 deletions

diff --git a/src/build/tools/hbRelease b/src/build/tools/hbRelease
index 898c2bbac..ba851756d 100755
--- a/src/build/tools/hbRelease
+++ b/src/build/tools/hbRelease
@@ -2137,6 +2137,15 @@ 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"});
@@ -2159,20 +2168,6 @@ 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