From 105f8bee56606f110ff6dc4ab6419b060a13b114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Tue, 19 Jul 2005 14:54:30 +0000 Subject: [PATCH] =?UTF-8?q?=C3=B6nce=20yap=C4=B1land=C4=B1rma=20dosyas?= =?UTF-8?q?=C4=B1na,=20sonra=20default=20ayarlara=20bakmak=20gerekiyor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/configfile.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pisi/configfile.py b/pisi/configfile.py index 690d25ee..1c7d89c9 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -23,6 +23,7 @@ #db_dir = /var/db/pisi #archives_dir = /var/cache/pisi/archives #packages_dir = /var/cache/pisi/packages +#index_dir = /var/cache/pisi/index #tmp_dir = /var/tmp/pisi import os @@ -54,6 +55,7 @@ class DirsDefaults: db_dir = "/var/db/pisi" archives_dir = "/var/cache/pisi/archives" packages_dir = "/var/cache/pisi/packages" + index_dir = "/var/cache/pisi/index" tmp_dir = "/var/tmp/pisi" @@ -78,15 +80,19 @@ class ConfigurationSection(object): self.section = section def __getattr__(self, attr): - if not self.items: - if hasattr(self.defaults, attr): - return getattr(self.defaults, attr) - return "" - for item in self.items: - if item[0] == attr: - return item[1] - return "" + # first search for attribute in the items provided in the + # configuration file. + if self.items: + for item in self.items: + if item[0] == attr: + return item[1] + + # then fall back to defaults + if hasattr(self.defaults, attr): + return getattr(self.defaults, attr) + + return "" class ConfigurationFile(object): """Parse and get configuration values from the configuration file""" @@ -106,7 +112,7 @@ class ConfigurationFile(object): repositems = parser.items("repos") except NoSectionError: repositems = [] - self.repos = ConfigurationSection("repos", generalitems) + self.repos = ConfigurationSection("repos", repositems) try: builditems = parser.items("build")