* merged with mainline

1 files changed, 4 insertions, 3 deletions

diff --git a/DistUpgrade/DistUpgradeConfigParser.py b/DistUpgrade/DistUpgradeConfigParser.py
index a4c55080..6879dfda 100644
--- a/DistUpgrade/DistUpgradeConfigParser.py
+++ b/DistUpgrade/DistUpgradeConfigParser.py
@@ -2,9 +2,10 @@ from ConfigParser import ConfigParser, NoOptionError
 
 
 class DistUpgradeConfig(ConfigParser):
-    def __init__(self):
+    def __init__(self, datadir):
         ConfigParser.__init__(self)
-        self.read(['DistUpgrade.cfg'])
+        self.datadir=datadir
+        self.read([datadir+'/DistUpgrade.cfg'])
     def getlist(self, section, option):
         try:
             tmp = self.get(section, option)
@@ -17,7 +18,7 @@ class DistUpgradeConfig(ConfigParser):
             filename = self.get(section, option)
         except NoOptionError:
             return []
-        items = [x.strip() for x in open(filename)]
+        items = [x.strip() for x in open(self.datadir+"/"+filename)]
         return filter(lambda s: not s.startswith("#") and not s == "", items)