Bug 343189: checksetup.pl HASH reference error with 2.18.5 to 2.20.2/2.22 upgrade

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=bkor, a=justdave

diff --git a/checksetup.pl b/checksetup.pl
index fae29156961bf8a60962cfe0590e3e0610ce280d..280b99aca742fc72a6c9f6568b06ec44e5758fb1 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -2271,7 +2271,8 @@ if (!$dbh->bz_column_info('bugs', 'lastdiffed')) {
 # declared to be unique.  Sure enough, somehow, I got 22 duplicated entries
 # in my database.  This code detects that, cleans up the duplicates, and
 # then tweaks the table to declare the field to be unique.  What a pain.
-if (!$dbh->bz_index_info('profiles', 'profiles_login_name_idx')->{TYPE}) {
+if (!$dbh->bz_index_info('profiles', 'profiles_login_name_idx') ||
+    !$dbh->bz_index_info('profiles', 'profiles_login_name_idx')->{TYPE}) {
     print "Searching for duplicate entries in the profiles table ...\n";
     while (1) {
         # This code is weird in that it loops around and keeps doing this