[Pkg-debile-commits] [debile-master] 01/01: Avoid group duplication when processing incoming

[Léo Cavaillé]

This is an automated email from the git hooks/post-receive script.

leo.cavaille-guest pushed a commit to branch master
in repository debile-master.

commit 67a5249ce03fb716fd04204f924c8168cb190d18
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Mon Aug 26 11:24:04 2013 +0200

    Avoid group duplication when processing incoming
---
 debile/master/incoming.py |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/debile/master/incoming.py b/debile/master/incoming.py
index acb09ee..372ae98 100644
--- a/debile/master/incoming.py
+++ b/debile/master/incoming.py
@@ -67,10 +67,17 @@ def accept_source(changes, user):
 
     dsc = os.path.basename(changes.get_dsc())
 
-    group = None
-    if 'X-Lucy-Group' in changes:
-        group = Group(name=changes['X-Lucy-Group'])
+    g = None
+    if 'X-Debile-Group' in changes:
         print "Source acceptance : detected group = %s" % group.name
+        group = session.query(Group)\
+            .filter(Group.name == changes['X-Debile-Group'])\
+            .all()
+        if not group:
+            g = Group(name=changes['X-Debile-Group'])
+            session.add(g)
+        else:
+            g = group[0]
 
     # Check if previous runs happened before on this version
     previous_runs = [ e[0] for e in session.query(Source.run)\
@@ -95,7 +102,7 @@ def accept_source(changes, user):
                 arch="",  # doubt here, useful ? remove build jobs according to this ?
                 user=owner,
                 maintainer=changes['maintainer'],
-                group=group,
+                group=g,
                 dsc=dsc,
                 run=run_nb)
     session.add(s)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-master.git