[Blends-commit] [SCM] website branch, master, updated. 497351521bf6142e914c84824d711c2f43315b38

[Andreas Tille]

The following commit has been merged in the master branch:
commit 497351521bf6142e914c84824d711c2f43315b38
Author: Andreas Tille <tille at debian.org>
Date:   Thu Dec 5 13:08:42 2013 +0100

    Use "service=udd" to connect to udd.debian.org

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 5270ac4..112172b 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -279,10 +279,10 @@ try:
   conn = psycopg2.connect(host="localhost",port=PORT,user="guest",database="udd")
 except psycopg2.OperationalError, err:
   try:
-    conn = psycopg2.connect(host="udd.debian.org",port=UDDPORT,user="guest",database="udd")
+    conn = psycopg2.connect("service=udd")
   except psycopg2.OperationalError, err:
     # logger not known at this state: logger.warning
-    print >>stderr, "PostgreSQL does not seem to run on port %i .. trying default port %i.\n\tMessage: %s" % (PORT, DEFAULTPORT, str(err))
+    print >>stderr, "Service=udd seems not to be installed on this host.\tMessage: %s" % (str(err))
     try:
         conn = psycopg2.connect(host="localhost",port=DEFAULTPORT,user="guest",database="udd")
     except psycopg2.OperationalError:
diff --git a/webtools/blendstasktoolsold.py b/webtools/blendstasktoolsold.py
index 7a5a0ea..5c1ee42 100644
--- a/webtools/blendstasktoolsold.py
+++ b/webtools/blendstasktoolsold.py
@@ -231,10 +231,10 @@ try:
 except psycopg2.OperationalError, err:
   logger.debug("PostgreSQL does not seem to run on port %i .. trying default port %i." % (PORT, DEFAULTPORT))
   try:
-    conn = psycopg2.connect(host="udd.debian.org",port=UDDPORT,user="guest",database="udd")
+    conn = psycopg2.connect("service=udd")
   except psycopg2.OperationalError, err:
     # logger not known at this state: logger.warning
-    print >>stderr, "PostgreSQL does not seem to run on port %i .. trying default port %i.\n\tMessage: %s" % (PORT, DEFAULTPORT, str(err))
+    print >>stderr, "Service=udd seems not to be installed on this host.\tMessage: %s" % (str(err))
     try: 
         conn = psycopg2.connect(host="localhost",port=DEFAULTPORT,user="guest",database="udd")
     except psycopg2.OperationalError:
diff --git a/webtools/bugs_udd.py b/webtools/bugs_udd.py
index 8656b54..5fd2744 100755
--- a/webtools/bugs_udd.py
+++ b/webtools/bugs_udd.py
@@ -32,10 +32,10 @@ try:
   conn = psycopg2.connect(host="localhost",port=PORT,user="guest",database="udd")
 except psycopg2.OperationalError, err:
   try:
-    conn = psycopg2.connect(host="udd.debian.org",port=UDDPORT,user="guest",database="udd")
+    conn = psycopg2.connect("service=udd")
   except psycopg2.OperationalError, err:
     # logger not known at this state: logger.warning
-    print >>stderr, "PostgreSQL does not seem to run on port %i .. trying default port %i.\n\tMessage: %s" % (PORT, DEFAULTPORT, str(err))
+    print >>stderr, "Service=udd seems not to be installed on this host.\tMessage: %s" % (str(err))
     try:
         conn = psycopg2.connect(host="localhost",port=DEFAULTPORT,user="guest",database="udd")
     except psycopg2.OperationalError:
diff --git a/webtools/thermometer.py b/webtools/thermometer.py
index b114517..3336c10 100755
--- a/webtools/thermometer.py
+++ b/webtools/thermometer.py
@@ -30,10 +30,10 @@ try:
   conn = psycopg2.connect(host="localhost",port=PORT,user="guest",database="udd")
 except psycopg2.OperationalError, err:
   try:
-    conn = psycopg2.connect(host="udd.debian.org",port=UDDPORT,user="guest",database="udd")
+    conn = psycopg2.connect("service=udd")
   except psycopg2.OperationalError, err:
     # logger not known at this state: logger.warning
-    print >>stderr, "PostgreSQL does not seem to run on port %i .. trying default port %i.\n\tMessage: %s" % (PORT, DEFAULTPORT, str(err))
+    print >>stderr, "Service=udd seems not to be installed on this host.\tMessage: %s" % (str(err))
     try:
         conn = psycopg2.connect(host="localhost",port=DEFAULTPORT,user="guest",database="udd")
     except psycopg2.OperationalError:

-- 
Static and dynamic websites for Debian Pure Blends