From 4942da371fcff7679fbcb2a6f0d991c4333c51f2 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Mon, 23 Apr 2012 21:54:36 +0200
Subject: [PATCH] [noarch/entropy] make unwanted deps QA check work better with
 multiple slotted deps

---
 .../entropy/packages/packages.server.qa.exec  | 55 ++++++++++++-------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/conf/noarch/entropy/packages/packages.server.qa.exec b/conf/noarch/entropy/packages/packages.server.qa.exec
index 668afe1..52304c7 100755
--- a/conf/noarch/entropy/packages/packages.server.qa.exec
+++ b/conf/noarch/entropy/packages/packages.server.qa.exec
@@ -83,24 +83,35 @@ def check_unwanted_deps():
         (entropy.dep.dep_getkey(x), (entropy.dep.dep_getslot(x), x)) \
             for x in pkg_deps if not x.startswith("!"))
 
+    pkg_deps_map = {}
+    for pkg_dep in pkg_deps:
+        if x.startswith("!"):
+            continue
+        key = entropy.dep.dep_getkey(pkg_dep)
+        obj = pkg_deps_map.setdefault(key, [])
+        val = entropy.dep.dep_getslot(pkg_dep), pkg_dep
+        obj.append(val)
+
     for unwanted_dep in unwanted_deps:
         unwanted_slot = entropy.dep.dep_getslot(unwanted_dep)
         if unwanted_slot:
             unwanted_dep = entropy.dep.remove_slot(unwanted_dep)
 
-        dep_data = pkg_deps_map.get(unwanted_dep)
-        if dep_data is None:
+        dep_data_list = pkg_deps_map.get(unwanted_dep)
+        if dep_data_list is None:
             continue
-        dep_slot, dep = dep_data
 
-        if not unwanted_slot:
-            unwanted_slot = dep_slot
+        for dep_data in dep_data_list:
+            dep_slot, dep = dep_data
 
-        if dep_slot == unwanted_slot:
-            write_attention_msg(
-                "%s contains forbidden dependency against %s" % (
-                    pkg_atom, pkg_deps_map[unwanted_dep][1]))
-            func_rc = 2
+            if not unwanted_slot:
+                unwanted_slot = dep_slot
+
+            if dep_slot == unwanted_slot:
+                write_attention_msg(
+                    "%s contains forbidden dependency against %s" % (
+                        pkg_atom, pkg_deps_map[unwanted_dep][1]))
+                func_rc = 2
 
     for warning_dep in warning_deps:
 
@@ -108,20 +119,22 @@ def check_unwanted_deps():
         if warning_slot:
             warning_dep = entropy.dep.remove_slot(warning_dep)
 
-        dep_data = pkg_deps_map.get(warning_dep)
-        if dep_data is None:
+        dep_data_list = pkg_deps_map.get(warning_dep)
+        if dep_data_list is None:
             continue
-        dep_slot, dep = dep_data
 
-        if not warning_slot:
-            unwanted_slot = dep_slot
+        for dep_data in dep_data_list:
+            dep_slot, dep = dep_data
 
-        if dep_slot == warning_slot:
-            write_attention_msg(
-                "%s contains a weirdo dependency against %s" % (
-                    pkg_atom, pkg_deps_map[warning_dep][1]))
-            if func_rc == 0:
-                func_rc = 1
+            if not warning_slot:
+                unwanted_slot = dep_slot
+
+            if dep_slot == warning_slot:
+                write_attention_msg(
+                    "%s contains a weirdo dependency against %s" % (
+                        pkg_atom, pkg_deps_map[warning_dep][1]))
+                if func_rc == 0:
+                    func_rc = 1
 
     if pkg_keywords is not None:
         keywords = pkg_keywords.split()