From a2e610b4fbdb921961eaccd647d44a11ecb3adc4 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sun, 27 Mar 2011 21:12:11 +0200
Subject: [PATCH] [entropy.db.skel] rewrite _runTreeUpdatesSlotmoveAction to be
 more robust on slot changes (on dependency strings)

---
 libraries/entropy/db/skel.py | 55 +++++++++++++++++++++++++-----------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/libraries/entropy/db/skel.py b/libraries/entropy/db/skel.py
index 291e4b56f..d47bdc067 100644
--- a/libraries/entropy/db/skel.py
+++ b/libraries/entropy/db/skel.py
@@ -1717,36 +1717,47 @@ class EntropyRepositoryBase(TextInterface, EntropyRepositoryPluginStore):
         atomkey = entropy.dep.dep_getkey(atom)
         slot_from = slotmove_command[1]
         slot_to = slotmove_command[2]
-        matches = self.atomMatch(atom, multiMatch = True)
+        matches = self.atomMatch(atom, multiMatch = True, maskFilter = False)
         iddependencies = set()
         slot_pfx = etpConst['entropyslotprefix']
 
         matched_package_ids = matches[0]
         for package_id in matched_package_ids:
 
-            ### UPDATE DATABASE
-            # update slot
-            self.setSlot(package_id, slot_to)
-
-            # look for packages we need to quickpkg again
-            # NOTE: quickpkg_queue is simply ignored if this is a client side
-            # repository
-            quickpkg_queue.add(atom + slot_pfx + slot_to)
-
             # only if we've found VALID matches !
             iddeps = self.searchDependency(atomkey, like = True, multi = True)
             for iddep in iddeps:
                 # update string
                 mydep = self.getDependency(iddep)
-                mydep_key = entropy.dep.dep_getkey(mydep)
-                if mydep_key != atomkey:
+
+                if mydep.find(slot_pfx + slot_from) == -1:
+                    # doesn't contain any trace of slot string, skipping
                     continue
-                if not mydep.endswith(slot_pfx + slot_from):
-                    # probably slotted dep
-                    continue
-                mydep_match = self.atomMatch(mydep)
-                if mydep_match not in matched_package_ids:
+
+                pkg_ids, pkg_rc = self.atomMatch(mydep, multiMatch = True,
+                    maskFilter = False)
+
+                pointing_to_me = False
+                for pkg_id in pkg_ids:
+                    if pkg_id not in matched_package_ids:
+                        # not my business
+                        continue
+                    # is this really pointing to me?
+                    mydep_key, mydep_slot = self.retrieveKeySlot(pkg_id)
+                    if mydep_key != atomkey:
+                        # not me!
+                        continue
+                    if mydep_slot != slot_from:
+                        # not me!
+                        continue
+                    # yes, it's pointing to me
+                    pointing_to_me = True
+                    break
+
+                if not pointing_to_me:
+                    # meh !
                     continue
+
                 mydep = mydep.replace(slot_pfx + slot_from, slot_pfx + slot_to)
                 # now update
                 # dependstable on server is always re-generated
@@ -1754,6 +1765,16 @@ class EntropyRepositoryBase(TextInterface, EntropyRepositoryPluginStore):
                 # we have to repackage also package owning this iddep
                 iddependencies |= self.searchPackageIdFromDependencyId(iddep)
 
+            ### UPDATE DATABASE
+            # update slot, do it here to avoid messing up with package match
+            # code up here
+            self.setSlot(package_id, slot_to)
+
+            # look for packages we need to quickpkg again
+            # NOTE: quickpkg_queue is simply ignored if this is a client side
+            # repository
+            quickpkg_queue.add(atom + slot_pfx + slot_to)
+
             plugins = self.get_plugins()
             for plugin_id in sorted(plugins):
                 plug_inst = plugins[plugin_id]