From 9141381d79d2f00c5fdbf93635d33029ac8d4fdc Mon Sep 17 00:00:00 2001 From: Remigiusz Dymecki Date: Mon, 27 Apr 2015 22:02:06 -0400 Subject: [PATCH] change in params --- ydcommon/__init__.py | 2 +- ydcommon/fab.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ydcommon/__init__.py b/ydcommon/__init__.py index ef4b880..bcf9ad9 100644 --- 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 index 835c42b..1de3ecb 100644 --- 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)