From a81dc7e58657ecb260d94560f20635c8c29aa27f Mon Sep 17 00:00:00 2001 From: Stefanos Harhalakis Date: Fri, 14 Jan 2011 01:33:00 +0000 Subject: [PATCH] Fix old-config loading. v0.9.1 --- sdist | 6 +++--- setup.py | 2 +- src/config.py | 16 +++++++++------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/sdist b/sdist index 618b461..de1476b 100755 --- a/sdist +++ b/sdist @@ -9,9 +9,9 @@ for i in dist/drlaunch-*.tar.gz ; do ver=${ver%.tar.gz} if ! [ -d "../$ver" ] ; then echo "New version: $ver" -# cp ../drlaunch/dist/$t .. - mkdir "../$ver" - cp ../drlaunch/dist/$t ../$ver/$t + cp ../drlaunch/dist/$t .. +# mkdir "../$ver" +# cp ../drlaunch/dist/$t ../$ver/$t # ln -s $t ../$ver/drlaunch_$ver.orig.tar.gz fi done diff --git a/setup.py b/setup.py index 1240b68..0962c8c 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ from distutils.core import setup setup( name='drlaunch', - version="0.8", + version="0.9.1", description="DrLaunch", author="Stefanos Harhalakis", author_email="v13@v13.gr", diff --git a/src/config.py b/src/config.py index ad92f14..7ddf67c 100755 --- a/src/config.py +++ b/src/config.py @@ -25,7 +25,7 @@ __version__ = "$Id: 0.py 2265 2010-02-21 19:16:26Z v13 $" import os import pickle -version = "0.8" +version = "0.9.1" try: from glib import get_user_config_dir @@ -218,23 +218,25 @@ class Config: ret=pickle.loads(st) if ret==None: + print "failed to load config" ret=None else: if ret['version']==1: - ret=parse_v1(ret) + ret=self.parse_v1(ret) if ret['version']==2: - ret=parse_v2(ret) + ret=self.parse_v2(ret) if ret['version']==3: - ret=parse_v3(ret) + ret=self.parse_v3(ret) if ret['version']==4: - ret=parse_v4(ret) + ret=self.parse_v4(ret) if ret['version']==5: - ret=parse_v5(ret) - except: + ret=self.parse_v5(ret) + except Exception, e: + print "config error:", e ret=None return(ret) -- 1.7.9.5