Commits

Mikhail Korobov committed a0e787a

Failing Squeeze tests are fixed. Recent git changes are reverted for now.

  • Participants
  • Parent commits 1c6a104

Comments (0)

Files changed (3)

File fab_deploy/mysql.py

     db_user = db_user or env.conf.DB_USER
     if db_password is None:
         db_password = env.conf.DB_PASSWORD
-    return db_user, db_password, db_name
+    return db_name, db_user, db_password
 
 @utils.run_as_sudo
 def mysql_install():

File fab_deploy/utils.py

     user, host, port = network.normalize(env.hosts[0])
 
     env.conf = getattr(env, 'conf', {})
+
     env.conf.setdefault('INSTANCE_NAME', user)
     env.conf.setdefault('PROJECT_PATH', '')
 
             assert env.conf.DB_ROOT_PASSWORD == env.conf.DB_PASSWORD, msg
         else:
             # auto-fill the missing option
-            password = env.conf.get('DB_ROOT_PASSWORD', env.conf.DB_PASSWORD)
-            env.conf.DB_PASSWORD = env.conf.DB_ROOT_PASSWORD = password
+            password = env.conf.get('DB_ROOT_PASSWORD',
+                                    env.conf.get('DB_PASSWORD', None))
+            if password is not None:
+                env.conf.DB_PASSWORD = env.conf.DB_ROOT_PASSWORD = password
 
     for vcs in ['git', 'hg', 'none']: # expand VCS name to full import path
         if env.conf.VCS == vcs:

File fab_deploy/vcs/git.py

 
 def init():
     run('git init')
+    run('git config receive.denyCurrentBranch ignore') # allow update current branch
 
 def up(branch):
     run('git checkout --force %s' % branch) # overwrite local changes