[Pkg-debile-commits] [debile-master] 05/28: Added APT list file generation + rename config option

[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 c8682b4db420297e20dfcacdf1e00d8709b20431
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Fri Aug 16 22:54:58 2013 +0200

    Added APT list file generation + rename config option
---
 lucy/archive.py |   13 +++++++++++++
 lucy/server.py  |    4 ++--
 skel/lucy.ini   |    2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lucy/archive.py b/lucy/archive.py
index 0739965..a1da2b6 100644
--- a/lucy/archive.py
+++ b/lucy/archive.py
@@ -144,6 +144,19 @@ class UserRepository:
             username = self.user.login,
             debile_fqdn = self.config.get('paths', 'debile_fqdn'))
 
+    def generate_aptbinarylist(self):
+        l = ""
+        build_flavors = listize(self.config.get('jobs', 'build-flavors'))
+        for compiler in build_flavors:
+            l += "# binary debile mirror of %s of packages compiled with %s\n" % (self.user.name, compiler)
+            path = os.path.join(self.config.get('paths', 'pool_url'), compiler)
+            l += "deb %s sid main\n\n" % path
+        return l
+
+
+
+
+
 
 
 
diff --git a/lucy/server.py b/lucy/server.py
index d1127c8..5cfd7ff 100644
--- a/lucy/server.py
+++ b/lucy/server.py
@@ -218,7 +218,7 @@ class LucyInterface(object):
         """
         session = Session()
         s = session.query(Source).filter(Source.source_id == source_id).one()
-        public = config.get('paths', 'public')
+        public = config.get('paths', 'pool_url')
         return "{public}/{pool}/{dsc}".format(
             public=public,
             pool=s.package_id,
@@ -240,7 +240,7 @@ class LucyInterface(object):
         """
         session = Session()
         b = session.query(Binary).filter(Binary.binary_id == binary_id).one()
-        public = config.get('paths', 'public')
+        public = config.get('paths', 'pool_url')
 
         return "{public}/{pool}/{arch}/{deb}".format(
             public=public,
diff --git a/skel/lucy.ini b/skel/lucy.ini
index 8b37efd..27d2932 100644
--- a/skel/lucy.ini
+++ b/skel/lucy.ini
@@ -47,6 +47,6 @@ incoming=/srv/local-mirror/incoming
 pool=/srv/local-mirror/pool
 ; A public URL to access the system path "pool" defined above, you must install
 ; some http server (apache, nginx...)
-public=http://debian-archive.via.ecp.fr/pool
+pool_url=http://debile.debian.net/pool
 ; The place we put the reports in, you can download them through debuild.me links
 job=/srv/local-mirror/jobs

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