From: Ed Bartosh <eduard.bartosh@intel.com>
Date: Fri, 2 May 2014 16:22:53 +0000 (+0300)
Subject: Fix check for common packages
X-Git-Tag: 0.3~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8336aefbaf74f5350079df149b05b257f3936f25;p=tools%2Frepa.git

Fix check for common packages

This check should not allow to create group from submissions with common
binary packages. It didn't work because of the incomplete implementation.

Fixes: #1847

Change-Id: I7e756913f8756bdb330bf31dae9574e973717f6c
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
---

diff --git a/repa/group.py b/repa/group.py
index 25be5ab..506eb02 100755
--- a/repa/group.py
+++ b/repa/group.py
@@ -69,7 +69,7 @@ def check_binary_pkgs(obs, submissions, force=False):
     Check if submissions have common binary packages.
     Check if binary packages exist.
     """
-    binaries = {}
+    binaries = defaultdict(dict)
     for submission, data in submissions.iteritems():
         pkgs = list(obs.get_binary_packages(data['project']))
         # check if submission has binary packages
@@ -80,12 +80,13 @@ def check_binary_pkgs(obs, submissions, force=False):
                                     (submission, repo[0], repo[1]))
             # check if submissions have common packages
             for subm, info in binaries.iteritems():
-                if repo == info['repo']:
-                    common = set(info['bins']).intersection(bins)
+                if repo in info:
+                    common = set(info[repo]).intersection(bins)
                     if common:
                         msg = '%s and %s have common packages: %s' % \
                               (subm, submission, ','.join(common))
                         raise RepaException(msg)
+            binaries[submission][repo] = bins
 
 
 def create_group_project(obs, submissions, meta, comment):