an even better forward port.

pisi/api.py

@@ -73,12 +73,12 @@ def init(database = True, write = True,
     else:
         ctx.ui = ui
 
-    destdir = ""
+    # FIXME: something is wrong here... see __init__.py also. Why do we import pisi.api in __init__.py
-    if ctx.get_option('destdir'):
+    import pisi.config
-        destdir = ctx.get_option('destdir')
+    ctx.config = pisi.config.Config(options)
 
-    if os.access('%s/var/log' % destdir, os.W_OK):
+    if os.access('%s/var/log' % ctx.config.log_dir(), os.W_OK):
-        handler = logging.handlers.RotatingFileHandler('%s/var/log/pisi.log' % destdir)
+        handler = logging.handlers.RotatingFileHandler('%s/var/log/pisi.log' % ctx.config.log_dir())
         #handler.setLevel(logging.DEBUG)
         formatter = logging.Formatter('%(asctime)-12s: %(levelname)-8s %(message)s')
         handler.setFormatter(formatter)
@@ -96,10 +96,6 @@ def init(database = True, write = True,
     if stderr:
         ctx.stderr = stderr
 
-    # FIXME: something is wrong here... see __init__.py also. Why do we import pisi.api in __init__.py
-    import pisi.config
-    ctx.config = pisi.config.Config(options)
-
     if signal_handling:
         ctx.sig = pisi.signalhandler.SignalHandler()
 

pisi/config.py

@@ -86,6 +86,9 @@ class Config(object):
         pisi.util.check_dir(dir)
         return dir
 
+    def log_dir(self):
+        return self.subdir(self.values.dirs.log_dir)
+
     def lib_dir(self):
         return self.subdir(self.values.dirs.lib_dir)
 

pisi/configfile.py

@@ -86,6 +86,7 @@ class BuildDefaults:
 class DirectoriesDefaults:
     "Default values for [directories] section"
     lib_dir = "/var/lib/pisi"
+    log_dir = "/var/log/pisi"
     db_dir = "/var/db/pisi"
     archives_dir = "/var/cache/pisi/archives"
     packages_dir = "/var/cache/pisi/packages"