Revert "Force hbRelease to search 'master' branch"

This reverts commit 6bb10d4941533e21d5b01c634d7f2fcaed83364c.

Change-Id: Id196db5a0e19494254063360cd74de85feeb3d23
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59807
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

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