diff --git a/pisi/configfile.py b/pisi/configfile.py index 88b8e0c3..6f49984d 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -45,8 +45,8 @@ #index_dir = /var/cache/pisi/index #packages_dir = /var/cache/pisi/package #tmp_dir = /var/pisi -#kde_dir = /usr/kde/3.5 -#qt_dir = /usr/qt/3 +#kde_dir = /usr/kde/4 +#qt_dir = /usr/qt/4 import os import re @@ -106,8 +106,8 @@ class DirectoriesDefaults: lock_dir = "/var/lock/subsys" index_dir = "/var/lib/pisi/index" tmp_dir = "/var/pisi" - kde_dir = "/usr/kde/3.5" - qt_dir = "/usr/qt/3" + kde_dir = "/usr/kde/4" + qt_dir = "/usr/qt/4" class ConfigurationSection(object): """ConfigurationSection class defines a section in the configuration diff --git a/tests/configfiletest.py b/tests/configfiletest.py index 2a09e56c..bab3df79 100644 --- a/tests/configfiletest.py +++ b/tests/configfiletest.py @@ -37,7 +37,7 @@ class ConfigFileTestCase(unittest.TestCase): def testPisiConfValues(self): cf = self.cf - self.assertEqual(cf.dirs.kde_dir, '/usr/kde/3.5') + self.assertEqual(cf.dirs.kde_dir, '/usr/kde/4') self.assertEqual(cf.dirs.compiled_packages_dir, '/var/cache/pisi/packages') self.assertEqual(cf.general.architecture, 'i686') self.assertEqual(cf.general.distribution_release, '2008')