[Pkg-debile-commits] [debile-master] 02/02: Add support for dput conf generation (builders' binaries)

[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 c9c4d662693a5b0d018feb1211bc27ee8d0968a6
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Fri Aug 23 13:25:06 2013 +0200

    Add support for dput conf generation (builders' binaries)
---
 debile/master/archive.py |    7 +++++--
 debile/master/server.py  |    6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debile/master/archive.py b/debile/master/archive.py
index 058c352..40f5683 100644
--- a/debile/master/archive.py
+++ b/debile/master/archive.py
@@ -1,6 +1,7 @@
 from debile.master.config import Config
 from debile.master.orm import User, Source, Binary, Package
 from debile.master.utils import run_command
+import debile.master.server
 from debian import deb822
 import shutil
 import os
@@ -12,6 +13,7 @@ def listize(entry):
     items = [x.strip() for x in entry.split(",")]
     return [None if x == "null" else x for x in items]
 
+
 def check_user_repository_consitency():
     """
     Check the database for all the users in there.
@@ -23,14 +25,15 @@ def check_user_repository_consitency():
     # TODO : implement the function
     return
 
+
 def generate_builders_dputcf():
-    session = Session()
+    session = debile.master.server.Session()
     config = Config()
     users = session.query(User.login).all()
 
     dputcf = ""
     for u in users:
-        build_flavors = listize(self.config.get('jobs', 'build-flavors'))
+        build_flavors = listize(config.get('jobs', 'build-flavors'))
         for compiler in build_flavors:
             # TODO : convertible to a template
             l = "[%s-%s]\n" % (u.login, compiler)
diff --git a/debile/master/server.py b/debile/master/server.py
index ce37e3c..8fd3ea8 100644
--- a/debile/master/server.py
+++ b/debile/master/server.py
@@ -6,7 +6,7 @@ from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
 from debile.master.orm import Machine, Job, Source, Binary, User, Package
 from debile.master.config import Config
 #from debile.master.mail import send_mail
-from debile.master.archive import UserRepository
+from debile.master.archive import UserRepository, generate_builders_dputcf
 
 from SimpleXMLRPCServer import SimpleXMLRPCServer
 from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
@@ -268,6 +268,10 @@ class DebileMasterInterface(object):
         return debpath.replace(config.get('paths', 'pool_path'), config.get('paths', 'pool_url'))
 
     @machine_method
+    def get_dputcf(self):
+        return generate_builders_dputcf()
+
+    @machine_method
     def get_current_jobs(self):
         """
         Get the current job for the builder or return None.

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