change in params

ArabellaTech · Apr 28, 2015 · 9141381 · 9141381
1 parent b6a6553
commit 9141381
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ydcommon/__init__.py b/ydcommon/__init__.py
@@ -2,7 +2,7 @@
 YD Technology common libraries
 """
 
-VERSION = (0, 1, 24)
+VERSION = (0, 1, 25)
 
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 

diff --git a/ydcommon/fab.py b/ydcommon/fab.py
@@ -73,13 +73,14 @@ def update_qa(quietly=False):
         print red('PLEASE DEPLOY CODE: fab deploy:all')
 
 
-def _check_branch(environment, user):
+def _check_branch(environment, user, change=False):
     if environment == 'qa':
         local_branch = _get_branch_name()
         remote_branch = _get_branch_name(False)
         if local_branch != remote_branch:
-            change = confirm(red('Branch on server is different, do you want to checkout %s ?' % local_branch),
-                             default=True)
+            if not change:
+                change = confirm(red('Branch on server is different, do you want to checkout %s ?' % local_branch),
+                                 default=True)
             if change:
                 sudo('git checkout %s' % local_branch, user=user)