diff --git a/pisi/actionsapi/variables.py b/pisi/actionsapi/variables.py index 3534e6ea..bf900ab1 100644 --- a/pisi/actionsapi/variables.py +++ b/pisi/actionsapi/variables.py @@ -71,9 +71,9 @@ class Dirs: localstate = 'var/lib' defaultprefix = 'usr' - #FIXME: Get these from config or somewhere else! - kde = '/usr/kde/3.5' - qt = '/usr/qt/3' + values = ctx.config.values + kde = values.dirs.kde_dir + qt = values.dirs.qt_dir def initVariables(): ctx.env = Env() diff --git a/pisi/configfile.py b/pisi/configfile.py index fd145c61..b4aef339 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -35,6 +35,8 @@ #index_dir = /var/cache/pisi/index #tmp_dir = /var/tmp/pisi #icon_theme_dir = /usr/share/icons/Tulliana-1.0 +#kde_dir = /usr/kde/3.5 +#qt_dir = /usr/qt/3 import os from ConfigParser import ConfigParser, NoSectionError @@ -71,7 +73,8 @@ class DirsDefaults: index_dir = "/var/cache/pisi/index" tmp_dir = "/var/tmp/pisi" icon_theme_dir = "/usr/share/icons/Tulliana-1.0" - + kde_dir = "/usr/kde/3.5" + qt_dir = "/usr/qt/3" class ConfigurationSection(object): """ConfigurationSection class defines a section in the configuration