summaryrefslogtreecommitdiff
path: root/scripts/skytools_upgrade.py
diff options
context:
space:
mode:
authorMarko Kreen2012-05-15 11:20:47 +0000
committerMarko Kreen2012-05-15 11:20:47 +0000
commit8d0d1585bd3ede34f227d8ea2c80baa275720685 (patch)
tree223173762fda896ae5789b38d39de51a62a42c7c /scripts/skytools_upgrade.py
parente0d74901ae30b41ed65a9594dca352dfaf993f17 (diff)
skytools_upgrade: show old version before upgrade
Diffstat (limited to 'scripts/skytools_upgrade.py')
-rwxr-xr-xscripts/skytools_upgrade.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/skytools_upgrade.py b/scripts/skytools_upgrade.py
index 169a1913..7501a832 100755
--- a/scripts/skytools_upgrade.py
+++ b/scripts/skytools_upgrade.py
@@ -49,7 +49,8 @@ def check_version(curs, schema, new_ver_str, recheck_func=None):
q = "select %s()" % funcname
curs.execute(q)
old_ver_str = curs.fetchone()[0]
- return is_version_ge(old_ver_str, new_ver_str)
+ ok = is_version_ge(old_ver_str, new_ver_str)
+ return ok, old_ver_str
class DbUpgrade(skytools.DBScript):
@@ -69,7 +70,8 @@ class DbUpgrade(skytools.DBScript):
continue
# new enough?
- if check_version(curs, schema, ver, recheck_func):
+ ok, oldver = check_version(curs, schema, ver, recheck_func)
+ if ok:
continue
# too old schema, no way to upgrade
@@ -80,6 +82,7 @@ class DbUpgrade(skytools.DBScript):
curs = db.cursor()
curs.execute('begin')
+ self.log.info("%s: Upgrading '%s' version %s to %s", dbname, schema, oldver, ver)
skytools.installer_apply_file(db, fn, self.log)
curs.execute('commit')