From ffd2a631205c07b19a5adb6d815dfebb37253c64 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 24 Jan 2013 10:58:44 +0100 Subject: [PATCH] quickfix DEVINF-344 --- cidb.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/cidb.py b/cidb.py index 126383a..5ddde11 100644 --- a/cidb.py +++ b/cidb.py @@ -6,23 +6,23 @@ import psycopg2.extras import logging # get current git branch -p = subprocess.Popen(["git", "rev-parse", "--symbolic-full-name", - "--abbrev-ref", "HEAD"], stdout=subprocess.PIPE) -p.wait() -branch = p.stdout.read().rstrip() +#p = subprocess.Popen(["git", "rev-parse", "--symbolic-full-name", +# "--abbrev-ref", "HEAD"], stdout=subprocess.PIPE) +#p.wait() +#branch = p.stdout.read().rstrip() -if branch == "master": - DB_USER = "cidb" - DB_PASSWD = "cidb" - DB_NAME = "cidb" - DB_HOST = "jenkins" - DB_PORT = 5432 -else: - DB_USER = "cidb_dev" - DB_PASSWD = "cidb_dev" - DB_NAME = "cidb_dev" - DB_HOST = "jenkins" - DB_PORT = 5432 +#if branch == "master": +DB_USER = "cidb" +DB_PASSWD = "cidb" +DB_NAME = "cidb" +DB_HOST = "jenkins" +DB_PORT = 5432 +#else: +# DB_USER = "cidb_dev" +# DB_PASSWD = "cidb_dev" +# DB_NAME = "cidb_dev" +# DB_HOST = "jenkins" +# DB_PORT = 5432 logger = logging.getLogger() -- 2.39.5