Entropy/Spritz:

- complete the implementation of the Package Masking Interface

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

client/text_ui.py

@@ -1017,7 +1017,7 @@ def removePackages(packages = [], atomsdata = [], deps = True, deep = False, sys
             elif rc == "Yes" and human:
                 doSelectiveRemoval = True
             elif rc == "No" and human:
-                rc = Equo.askQuestion("     %s") % (_("Would you like to skip this step then ?"),)
+                rc = Equo.askQuestion("     %s" % (_("Would you like to skip this step then ?"),))
                 if rc == "Yes":
                     return 0,0
         elif deps:

spritz/src/entropyapi.py

@@ -54,8 +54,8 @@ class QueueExecutor:
 
         # unmask packages
         for match in self.Spritz.etpbase.unmaskingPackages:
-            result = self.Entropy.unmask_match(obj.matched_atom)
-            if not result:
+            result = self.Entropy.unmask_match(match)
+            if not result or self.Entropy.is_match_masked(match):
                 dbconn = self.Entropy.openRepositoryDatabase(match[1])
                 atom = dbconn.retrieveAtom(match[0])
                 okDialog( self.Spritz.ui.main, "%s: %s" % (_("Error enabling masked package"),atom) )
@@ -112,6 +112,7 @@ class QueueExecutor:
             Package.kill()
             del Package
             self.Entropy.cycleDone()
+
         self.Spritz.ui.skipMirror.hide()
 
         # then removalQueue

spritz/src/etpgui/packages.py

@@ -74,6 +74,12 @@ class EntropyPackage:
     def getName(self):
         return self.dbconn.retrieveAtom(self.matched_atom[0])
 
+    def isMasked(self):
+        idpackage, idmask = self.dbconn.idpackageValidator(self.matched_atom[0])
+        if idpackage != -1:
+            return False
+        return True
+
     def getNameDesc(self):
         t = cleanMarkupString('/'.join(self.getName().split("/")[1:]))
         if self.masked:
@@ -307,6 +313,7 @@ class EntropyPackage:
     version = property(fget=getVer)
     release = property(fget=getRel)
     slot = property(fget=getSlot)
+    maskstat = property(fget=isMasked)
     keywords = property(fget=getKeywords)
     useflags = property(fget=getUseflags)
     homepage = property(fget=getHomepage)

spritz/src/gui.py

@@ -241,6 +241,9 @@ class SpritzGUI:
         self.setupPkgFilter()
         self.setupAdvisoriesFilter()
 
+        self.setupImages()
+
+
     def on_console_click(self, widget, event):
         self.console_menu.popup( None, None, None, event.button, event.time )
         return True
@@ -334,6 +337,18 @@ class SpritzGUI:
         self.ui.content.pack_start( button, False )
         self.pageButtons[page] = button
 
+    def setupImages(self):
+
+        # progressImage
+        iconpath = os.path.join(const.PIXMAPS_PATH,"sabayon.png")
+        if os.path.isfile(iconpath) and os.access(iconpath,os.R_OK):
+            try:
+                p = gtk.gdk.pixbuf_new_from_file( iconpath )
+                self.ui.progressImage.set_from_pixbuf(p)
+            except gobject.GError:
+                pass
+
+
     def setPage( self, page ):
         self.activePage = page
         widget = self.pageButtons[page]

spritz/src/views.py

@@ -26,6 +26,7 @@ from entropyapi import EquoConnection
 from etpgui import *
 from entropyConstants import *
 from entropy_i18n import _,_LOCALE
+from dialogs import MaskedPackagesDialog
 
 TOGGLE_WIDTH = 12
 
@@ -133,6 +134,7 @@ class EntropyPackageView:
         self.installed_undopurge = self.installed_menu_xml.get_widget( "undopurge" )
         self.installed_remove = self.installed_menu_xml.get_widget( "remove" )
         self.installed_undoremove = self.installed_menu_xml.get_widget( "undoremove" )
+        self.installed_unmask = self.installed_menu_xml.get_widget( "unmask" )
         self.installed_reinstall.set_image(self.img_pkg_reinstall)
         self.installed_undoreinstall.set_image(self.img_pkg_undoreinstall)
         self.installed_remove.set_image(self.img_pkg_remove)
@@ -175,6 +177,7 @@ class EntropyPackageView:
         self.updates_update.hide()
 
     def reset_installed_packages_menu(self):
+        self.installed_unmask.hide()
         self.installed_undoremove.hide()
         self.installed_undoreinstall.hide()
         self.installed_undopurge.hide()
@@ -187,6 +190,7 @@ class EntropyPackageView:
             self.installed_purge.show()
 
     def hide_installed_packages_menu(self):
+        self.installed_unmask.hide()
         self.installed_undoremove.hide()
         self.installed_undoreinstall.hide()
         self.installed_undopurge.hide()
@@ -270,6 +274,10 @@ class EntropyPackageView:
     def run_installed_menu_stuff(self, obj):
         do_show = True
         self.reset_installed_packages_menu()
+        if obj.masked:
+            # still ?
+            if obj.maskstat:
+                self.installed_unmask.show()
         if obj.queued:
             self.hide_installed_packages_menu()
             if obj.queued == "r" and not obj.do_purge:
@@ -307,6 +315,19 @@ class EntropyPackageView:
                 self.loaded_reinstallable = to_obj
                 break
 
+    def on_unmask_activate(self, widget):
+        busyCursor(self.main_window)
+        model, iter = self.loaded_widget.get_selection().get_selected()
+        obj = self.store.get_value( iter, 0 )
+
+        oldmask = self.etpbase.unmaskingPackages.copy()
+        mydialog = MaskedPackagesDialog(self.Equo, self.etpbase, self.ui.main, [obj])
+        result = mydialog.run()
+        if result != -5:
+            self.etpbase.unmaskingPackages = oldmask.copy()
+        mydialog.destroy()
+        normalCursor(self.main_window)
+
     def on_remove_activate(self, widget, do_purge = False):
         busyCursor(self.main_window)
         model, iter = self.loaded_widget.get_selection().get_selected()
@@ -654,8 +675,6 @@ class EntropyQueueView:
 
     def setup_view( self ):
 
-        #column.set_fixed_width( size )
-
         model = gtk.TreeStore( gobject.TYPE_STRING )
         self.view.set_model( model )
         cell1 = gtk.CellRendererText()