diff options
| -rw-r--r-- | NEWS | 12 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | python/skytools/scripting.py | 3 | ||||
| -rwxr-xr-x | scripts/simple_local_consumer.py | 6 | ||||
| -rwxr-xr-x | setup_pkgloader.py | 2 | ||||
| -rwxr-xr-x | setup_skytools.py | 2 |
7 files changed, 27 insertions, 6 deletions
@@ -1,4 +1,16 @@ +2014-04-09 - SkyTools 3.2.1 + + = Fixes = + + * skytools.scripting: moved psycopg2 reference to actual script using it + * skytools.timeutil: fixed for Python versions less than 2.7 + + = Cleanups = + + * libusual: updated to the latest version (that is already 9 months old) + * setup*.py: fixes; updated to point to correct licence + 2014-03-31 - SkyTools 3.2 - "Hit any user to continue" = Features = diff --git a/configure.ac b/configure.ac index 458deb5a..3d573ab1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(skytools, 3.2) +AC_INIT(skytools, 3.2.1) AC_CONFIG_SRCDIR(python/londiste.py) AC_CONFIG_HEADER(lib/usual/config.h) AC_PREREQ([2.59]) diff --git a/debian/changelog b/debian/changelog index 3712fc0b..066e8471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +skytools3 (3.2.1) experimental; urgency=low + + * v3.2.1 + + -- martinko <gamato@users.sf.net> Wed, 09 Apr 2014 17:34:51 +0200 + skytools3 (3.2) experimental; urgency=low * v3.2 diff --git a/python/skytools/scripting.py b/python/skytools/scripting.py index 68ddc4d3..77c1bec5 100644 --- a/python/skytools/scripting.py +++ b/python/skytools/scripting.py @@ -14,7 +14,6 @@ import signal import sys import time -import psycopg2 import skytools import skytools.skylog @@ -958,7 +957,7 @@ class DBScript(BaseScript): sql_retry_formula_a = self.cf.getint("sql_retry_formula_a", 1) sql_retry_formula_b = self.cf.getint("sql_retry_formula_b", 5) sql_retry_formula_cap = self.cf.getint("sql_retry_formula_cap", 60) - elist = exceptions or (psycopg2.OperationalError,) + elist = exceptions or tuple([]) stime = time.time() tried = 0 dbc = None diff --git a/scripts/simple_local_consumer.py b/scripts/simple_local_consumer.py index 50177097..e78ba0b4 100755 --- a/scripts/simple_local_consumer.py +++ b/scripts/simple_local_consumer.py @@ -22,12 +22,15 @@ Config:: import sys +import psycopg2 + import pkgloader pkgloader.require('skytools', '3.0') import pgq import skytools + class SimpleLocalConsumer(pgq.LocalConsumer): __doc__ = __doc__ @@ -57,7 +60,8 @@ class SimpleLocalConsumer(pgq.LocalConsumer): payload['pgq.ev_extra4'] = ev.ev_extra4 self.log.debug(self.dst_query, payload) - retries, curs = self.execute_with_retry('dst_db', self.dst_query, payload) + retries, curs = self.execute_with_retry('dst_db', self.dst_query, payload, + exceptions = (psycopg2.OperationalError,)) if curs.statusmessage[:6] == 'SELECT': res = curs.fetchall() self.log.debug(res) diff --git a/setup_pkgloader.py b/setup_pkgloader.py index 28b15d73..41669861 100755 --- a/setup_pkgloader.py +++ b/setup_pkgloader.py @@ -4,7 +4,7 @@ from distutils.core import setup setup( name = "pkgloader", - license = "BSD", + license = "ISC", version = '1.0', maintainer = "Marko Kreen", maintainer_email = "markokr@gmail.com", diff --git a/setup_skytools.py b/setup_skytools.py index 54a623a9..ce52e250 100755 --- a/setup_skytools.py +++ b/setup_skytools.py @@ -193,7 +193,7 @@ if BUILD_C_MOD: # run actual setup setup( name = "skytools", - license = "BSD", + license = "ISC", version = ac_ver, maintainer = "Marko Kreen", maintainer_email = "markokr@gmail.com", |