[Uludag-commits] r24598 - in trunk/pisi/pisi: cli db

[uludag-commits at pardus.org.tr]

Author: faik
Date: Thu Jul  9 09:22:03 2009
New Revision: 24598

Modified:
   trunk/pisi/pisi/cli/upgrade.py
   trunk/pisi/pisi/db/lazydb.py
Log:
Fix for pisi up -c system.base

<type 'exceptions.AttributeError'>: cdb                                                                                                                        
Genel yardım için lütfen 'pisi help' komutunu kullanınız.                                                                                                      
Geri izleme verisi:                                                                                                                                            
  File "/usr/bin/pisi", line 80, in <module>                                                                                                                   
    cli.run_command()                                                                                                                                          
  File "/usr/lib/pardus/pisi/cli/pisicli.py", line 140, in run_command                                                                                         
    self.command.run()                                                                                                                                         
  File "/usr/lib/pardus/pisi/cli/upgrade.py", line 100, in run                                                                                                 
    if self.componentdb.has_component(name):                                                                                                                   
  File "/usr/lib/pardus/pisi/db/componentdb.py", line 65, in has_component                                                                                     
    return self.cdb.has_item(name, repo)                                                                                                                       
  File "/usr/lib/pardus/pisi/db/lazydb.py", line 92, in __getattr__                                                                                            
    raise AttributeError, attr   



Modified: trunk/pisi/pisi/cli/upgrade.py
=================================================================
--- trunk/pisi/pisi/cli/upgrade.py	(original)
+++ trunk/pisi/pisi/cli/upgrade.py	Thu Jul  9 09:22:03 2009
@@ -45,7 +45,6 @@
 
     def __init__(self, args):
         super(Upgrade, self).__init__(args)
-        self.componentdb = pisi.db.componentdb.ComponentDB()
 
     name = ("upgrade", "up")
 
@@ -96,12 +95,13 @@
         components = ctx.get_option('component')
         packages = []
         if components:
+            componentdb = pisi.db.componentdb.ComponentDB()
             for name in components:
-                if self.componentdb.has_component(name):
+                if componentdb.has_component(name):
                     if repository:
-                        packages.extend(self.componentdb.get_packages(name, walk=True, repo=repository))
+                        packages.extend(componentdb.get_packages(name, walk=True, repo=repository))
                     else:
-                        packages.extend(self.componentdb.get_union_packages(name, walk=True))
+                        packages.extend(componentdb.get_union_packages(name, walk=True))
         packages.extend(self.args)
 
         packages = pisi.blacklist.exclude_from(packages, ctx.const.blacklist)

Modified: trunk/pisi/pisi/db/lazydb.py
=================================================================
--- trunk/pisi/pisi/db/lazydb.py	(original)
+++ trunk/pisi/pisi/db/lazydb.py	Thu Jul  9 09:22:03 2009
@@ -31,6 +31,7 @@
         return self._the_instances[type(self).__name__]
 
     def _delete(self):
+        #FIXME: After invalidate, previously initialized db object becomes stale
         del self._the_instances[type(self).__name__]
 
 class LazyDB(Singleton):