From 0ee4afb3d31c112eb6c771c067e721c76b2b8e28 Mon Sep 17 00:00:00 2001
From: "A. Murat Eren" <meren@pardus.org.tr>
Date: Mon, 20 Mar 2006 09:09:13 +0000
Subject: [PATCH] =?UTF-8?q?=20=20her=20seferinde=20yap=C4=B1lmas=C4=B1=20g?=
 =?UTF-8?q?erekmeyen=20i=C5=9Fleri=20=5F=5Finit=5F=5F=20i=C3=A7erisine=20t?=
 =?UTF-8?q?a=C5=9F=C4=B1=20+=20build=20sisteminin=20relative=20destination?=
 =?UTF-8?q?=20dir'ler=20ile=20d=C3=BCzg=C3=BCn=20=C3=A7al=C4=B1=C5=9Fmas?=
 =?UTF-8?q?=C4=B1n=C4=B1=20sa=C4=9Fla.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pisi/config.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pisi/config.py b/pisi/config.py
index e281b45c..95a8ecba 100644
--- a/pisi/config.py
+++ b/pisi/config.py
@@ -17,7 +17,7 @@ PISI Configuration module is used for gathering and providing
 regular PISI configurations.
 """
 
-from os import getcwd
+import os
 
 import gettext
 __trans = gettext.translation('pisi', fallback=True)
@@ -46,6 +46,20 @@ class Config(object):
         self.options = options
         self.values = ConfigurationFile("/etc/pisi/pisi.conf")
 
+        destdir = self.get_option('destdir')
+        if destdir:
+            if destdir.strip().startswith('/'):
+                self.destdir = destdir
+            else:
+                self.destdir = join(os.getcwd(), destdir)
+        else:
+            self.destdir = self.values.general.destinationdirectory
+
+        if not os.path.exists(self.destdir):
+            ctx.ui.warning( _('Destination directory %s does not exist. Creating it.') % self.destdir)
+            os.makedirs(self.destdir)
+
+
     def get_option(self, opt):
         if self.options:
             if hasattr(self.options, opt):
@@ -58,19 +72,7 @@ class Config(object):
     # pkg_x_dir: per package directory for storing info type x
 
     def dest_dir(self):
-        dir = self.get_option('destdir')
-        if dir:
-            if dir.strip()[0] == '/':
-                dir = str(dir)
-            else:
-                dir = join(getcwd(), dir)
-        else:
-            dir = self.values.general.destinationdirectory
-        import os.path
-        if not os.path.exists(dir):
-            ctx.ui.warning( _('Destination directory %s does not exist. Creating it.') % dir)
-            os.makedirs(dir)
-        return dir
+        return self.destdir
 
     def subdir(self, path):
         dir = join(self.dest_dir(), path)