From a067a1845ec51c7f72fe06562ffa737e076f4049 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Sun, 27 Sep 2015 15:37:22 -0700 Subject: [PATCH] bench admin changes --- bench/app.py | 2 +- bench/utils.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bench/app.py b/bench/app.py index 8f57d2ba..e4297268 100644 --- a/bench/app.py +++ b/bench/app.py @@ -124,7 +124,7 @@ def get_current_version(app, bench='.'): def get_upstream_version(app, branch=None, bench='.'): repo_dir = get_repo_dir(app, bench=bench) if not branch: - branch = get_current_branch(app) + branch = get_current_branch(app, bench=bench) try: contents = subprocess.check_output(['git', 'show', 'upstream/{branch}:setup.py'.format(branch=branch)], cwd=repo_dir, stderr=subprocess.STDOUT) except subprocess.CalledProcessError, e: diff --git a/bench/utils.py b/bench/utils.py index 316df172..a837df96 100644 --- a/bench/utils.py +++ b/bench/utils.py @@ -51,7 +51,8 @@ def init(path, apps_path=None, no_procfile=False, no_backups=False, if os.path.exists(path): print 'Directory {} already exists!'.format(path) - sys.exit(1) + raise Exception("Site directory already exists") + # sys.exit(1) os.mkdir(path) for dirname in ('apps', 'sites', 'config', 'logs'):