From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 24 Jan 2013 09:58:44 +0000 (+0100)
Subject: quickfix DEVINF-344
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=ffd2a631205c07b19a5adb6d815dfebb37253c64;p=profitbricks%2Fjenkins-build-scripts.git

quickfix DEVINF-344
---

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()