From 1ffa367cbeb58c886baf00c38f437f4b75570353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eray=20=C3=96zkural?= <eray@pardus.org.tr>
Date: Mon, 8 Aug 2005 21:22:18 +0000
Subject: [PATCH] * fix: import config bug   - changing ref of a singleton: not
 a good idea after all!

---
 pisi/cli/commands.py |  3 +--
 pisi/config.py       |  2 --
 pisi/install.py      |  4 +++-
 pisi/installdb.py    | 12 ++++++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py
index c9c7adf7..dc8f2eea 100644
--- a/pisi/cli/commands.py
+++ b/pisi/cli/commands.py
@@ -66,7 +66,7 @@ class Command(object):
         self.args = args[1:]
 
         # initialize PiSi
-        print '**** running cmd'
+        #print '**** running cmd'
         pisi.config.config = pisi.config.Config(self.options)
         cli = pisi.ui.CLI(self.options.debug)
         pisi.ui.ui = cli
@@ -200,7 +200,6 @@ repositories (with add-repo).
 """
     def __init__(self):
         super(Install, self).__init__()
-        print pisi.config.config.options
 
     def run(self):
         if not self.args:
diff --git a/pisi/config.py b/pisi/config.py
index 9ff3b26c..1e9b1d85 100644
--- a/pisi/config.py
+++ b/pisi/config.py
@@ -23,8 +23,6 @@ class Config(object):
     """Config Singleton"""
     
     def __init__(self, options = None):
-        if options:
-            print 'wohoo', options
         self.options = options
         self.values = ConfigurationFile("/etc/pisi/pisi.conf")
         self.destdir = self.values.general.destinationdirectory
diff --git a/pisi/install.py b/pisi/install.py
index b4dc13cd..c0ded9de 100644
--- a/pisi/install.py
+++ b/pisi/install.py
@@ -153,12 +153,14 @@ class Installer:
     def update_databases(self):
         "update databases"
 
-        print "INSTALL", config.options, config.options.ignore_comar
+        #print "INSTALL", config.options, config.options.ignore_comar
 
         # installdb
         installdb.install(self.metadata.package.name,
                           self.metadata.package.version,
                           self.metadata.package.release)
 
+        #print "INSTALL2", config.options, config.options.ignore_comar
+
         # installed packages
         inst_packagedb.add_package(self.pkginfo)
diff --git a/pisi/installdb.py b/pisi/installdb.py
index 1750a81b..fc16c1ea 100644
--- a/pisi/installdb.py
+++ b/pisi/installdb.py
@@ -14,11 +14,12 @@
 #
 # Author:  Eray Ozkural <eray@uludag.org.tr>
 
+# System
+import os
+import fcntl
 
-import os, fcntl
+# PiSi
 import lockeddbshelve as shelve
-
-from config import config
 from constants import const
 from files import Files
 import util
@@ -32,10 +33,12 @@ class InstallDB:
         from os.path import join
         self.d = shelve.LockedDBShelf('install')
         self.dp = shelve.LockedDBShelf('configpending')
+        from config import config
         self.files_dir = os.path.join(config.db_dir(), 'files')
 
     def files_name(self, pkg, version, release):
         from os.path import join
+        from config import config
         pkg_dir = join(config.lib_dir(), pkg + '-' + version + '-' + release)
         return join(pkg_dir, const.files_xml)
 
@@ -87,7 +90,8 @@ class InstallDB:
     def install(self, pkg, version, release):
         """install package with specific version and release"""
         pkg = str(pkg)
-        print "INSTALLDB", config.options, config.options.ignore_comar
+        from config import config
+        #print "INSTALLDB", config.options#, config.options.ignore_comar
         if self.is_installed(pkg):
             raise InstallDBError("already installed")
         if config.options.ignore_comar: