Exit loop when database is created.

slapos/recipe/generic_mysql/mysql.py

@@ -42,7 +42,6 @@ def updateMysql(args):
   sleep = 30
   is_succeed = False
   while True:
-    if not is_succeed:
     mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--no-defaults', '--user=root', '--socket=%s' % conf['socket']]
     mysql_upgrade = subprocess.Popen(mysql_upgrade_list, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     result = mysql_upgrade.communicate()[0]
@@ -50,7 +49,6 @@ def updateMysql(args):
       mysql_upgrade.kill()
     if mysql_upgrade.returncode != 0 and not 'is already upgraded' in result:
       print "Command %r failed with result:\n%s" % (mysql_upgrade_list, result)
-        print 'Sleeping for %ss and retrying' % sleep
     else:
       if mysql_upgrade.returncode == 0:
         print "MySQL database upgraded with result:\n%s" % result
@@ -64,7 +62,6 @@ def updateMysql(args):
         mysql.kill()
       if mysql.returncode != 0:
         print 'Command %r failed with:\n%s' % (mysql_list, result)
-          print 'Sleeping for %ss and retrying' % sleep
       else:
         # import timezone database
         mysql_tzinfo_to_sql_binary = os.path.join(
@@ -76,7 +73,6 @@ def updateMysql(args):
         timezone_sql = mysql_tzinfo_to_sql.communicate()[0]
         if mysql.returncode != 0:
           print 'Command %r failed with:\n%s' % (mysql_tzinfo_to_sql_list, result)
-            print 'Sleeping for %ss and retrying' % sleep
         else:
           mysql = subprocess.Popen(mysql_list + ['mysql',], stdin=subprocess.PIPE,
                                    stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -85,9 +81,11 @@ def updateMysql(args):
             mysql.kill()
           if mysql.returncode != 0:
             print 'Command %r failed with:\n%s' % (mysql_list, result)
-              print 'Sleeping for %ss and retrying' % sleep
           is_succeed = True
+    if is_succeed:
       print 'SlapOS initialisation script succesfully applied on database.'
+      break
+    print 'Sleeping for %ss and retrying' % sleep
     sys.stdout.flush()
     sys.stderr.flush()
     time.sleep(sleep)