From 04e4890f3419f85c2aaaec7c91b20eccfff622e2 Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Sat, 25 Sep 2010 13:04:20 +0000 Subject: [PATCH] Define changelogs export path into projectb Signed-off-by: Luca Falavigna --- config/debian/dak.conf | 1 - dak/make_changelog.py | 7 ++++++- daklib/config.py | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 192a039b..58c47fbc 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -475,5 +475,4 @@ Changelogs { Testing "/srv/release.debian.org/tools/trille/current-testing"; Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog"; - Export "/srv/ftp-master.debian.org/export/changelogs"; } diff --git a/dak/make_changelog.py b/dak/make_changelog.py index 2f85c89b..69e96d65 100755 --- a/dak/make_changelog.py +++ b/dak/make_changelog.py @@ -58,6 +58,7 @@ from re import split from shutil import rmtree from daklib.dbconn import * from daklib import utils +from daklib.config import Config ################################################################################ @@ -260,6 +261,7 @@ def export_files(session, pool, clpool, temppath): def main(): Cnf = utils.get_conf() + cnf = Config() Arguments = [('h','help','Make-Changelog::Options::Help'), ('s','suite','Make-Changelog::Options::Suite','HasArg'), ('b','base-suite','Make-Changelog::Options::Base-Suite','HasArg'), @@ -291,7 +293,10 @@ def main(): if testing: display_changes(testing_summary(Cnf['Changelogs::Testing'], session), 1) elif export: - export_files(session, Cnf['Dir::Pool'], Cnf['Changelogs::Export'], Cnf['Dir::TempPath']) + if cnf.exportpath: + export_files(session, Cnf['Dir::Pool'], cnf.exportpath, Cnf['Dir::TempPath']) + else: + utils.fubar('No changelog export path defined') elif binnmu: display_changes(get_binary_uploads(suite, base_suite, session), 3) else: diff --git a/daklib/config.py b/daklib/config.py index 1c3f92ba..932df6b5 100755 --- a/daklib/config.py +++ b/daklib/config.py @@ -108,7 +108,8 @@ class Config(object): """ for field in [('db_revision', None, int), ('defaultsuitename', 'unstable', str), - ('signingkeyids', '', str) + ('signingkeyids', '', str), + ('exportpath', '', str) ]: setattr(self, 'get_%s' % field[0], lambda x=None: self.get_db_value(field[0], field[1], field[2])) setattr(Config, '%s' % field[0], property(fget=getattr(self, 'get_%s' % field[0]))) -- 2.39.5