Entropy:

- fix a small caching issue


git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1726 cd1c1023-2f26-0410-ae45-c471fc1f0318

TODO

@@ -12,8 +12,11 @@ TODO list
   - find a way to better handle real smartapps deps (need split PDEPEND?)
 
   Spritz:
-    - package masking menu (*)
-    - GLSA interface (*)
+    - install button required time
+    - gettext cleanups
+
+    - package masking menu
+    - GLSA interface
     - applet ignores masks
     - applet from critical to up to date
     - Popularity feature / Your Ego service

libraries/entropy.py

@@ -3900,8 +3900,9 @@ class PackageInterface:
                             slot = self.infoDict['slot']
                             matches = self.Entropy.atomMatch(key, matchSlot = slot, multiRepo = True, multiMatch = True)
                             if matches[1] == 0:
-                                if matches[0] not in disk_cache['available']:
-                                    disk_cache['available'].append(matches[0])
+                                for mymatch in matches[0]:
+                                    if mymatch not in disk_cache['available']:
+                                        disk_cache['available'].append(mymatch)
 
                         # install, doing here because matches[0] could contain self.matched_atoms
                         if self.matched_atom in disk_cache['available']:

spritz/src/spritz.py

@@ -415,16 +415,6 @@ class SpritzController(Controller):
             self.populateFilesUpdate()
         self.setNotebookPage(const.PAGES[page])
 
-    def on_category_selected(self,widget):
-        ''' Category Change Handler '''
-        ( model, iterator ) = widget.get_selection().get_selected()
-        if model != None and iterator != None:
-            category = model.get_value( iterator, 1 )
-            if category != '':
-                self.addCategoryPackages(category)
-            else:
-                self.pkgView.clear()
-
     def on_pkgFilter_toggled(self,rb,action):
         ''' Package Type Selection Handler'''
         if rb.get_active(): # Only act on select, not deselect.
@@ -807,8 +797,6 @@ class SpritzController(Controller):
                 self.populateCategoryPackages(id)
         self.unsetBusy()
 
-# Menu Handlers
-
     def on_FileQuit( self, widget ):
         self.quit()
 
@@ -816,9 +804,6 @@ class SpritzController(Controller):
         about = AboutDialog(const.PIXMAPS_PATH+'/spritz-about.png',const.CREDITS,self.settings.branding_title)
         about.show()
 
-    def on_ToolsRepoCache( self, widget ):
-        self.logger.info(_('Cleaning up all yum metadata'))
-
 class SpritzApplication(SpritzController,SpritzGUI):
 
     def __init__(self):
@@ -826,7 +811,7 @@ class SpritzApplication(SpritzController,SpritzGUI):
         # check if another instance is running
         cr = EquoConnection.entropyTools.applicationLockCheck("Spritz Loader", gentle = True)
         if cr:
-            # warn the user 
+            # warn the user
             okDialog( None, _("<big><b>Sorry to tell you</b></big>\t\t\nAnother instance of Entropy <b>is running</b>. <u>Close</u> it or <u>remove</u>: %s") % (etpConst['pidfile'],) )
             sys.exit()
 
@@ -1140,19 +1125,6 @@ class SpritzApplication(SpritzController,SpritzGUI):
         # reset labels
         self.resetProgressText()
 
-    def addCategoryPackages(self,cat = None):
-        msg = _('Package View Population')
-        self.setStatus(msg)
-        self.setBusy()
-        self.pkgView.store.clear()
-        pkgs = self.yumbase.getPackagesByCategory(cat)
-        if pkgs:
-            pkgs.sort()
-            self.pkgView.populate(pkgs)
-            msg = _('Package View Population Completed')
-            self.setStatus(msg)
-        self.unsetBusy()
-
     def processPackageQueue( self, pkgs, doAll=False):
         """ Workflow for processing package queue """
         self.setStatus( _( "Running tasks" ) )