[dak/master] make-changelog: drop useless -T command
Signed-off-by: Luca Falavigna <dktrkranz@debian.org>
---
config/debian/dak.conf | 1 -
dak/make_changelog.py | 39 ++++++---------------------------------
2 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 58c47fb..403d1d5 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -473,6 +473,5 @@ Common
Changelogs
{
- Testing "/srv/release.debian.org/tools/trille/current-testing";
Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog";
}
diff --git a/dak/make_changelog.py b/dak/make_changelog.py
index 69e96d6..5237d91 100755
--- a/dak/make_changelog.py
+++ b/dak/make_changelog.py
@@ -68,7 +68,6 @@ def usage (exit_code=0):
Usage:
make-changelog -s <suite> -b <base_suite> [OPTION]...
make-changelog -e
- make-changelog -T
Options:
@@ -77,9 +76,7 @@ Options:
-b, --base-suite suite to be taken as reference for comparison
-n, --binnmu display binNMUs uploads instead of source ones
- -e, --export export interesting files from source packages
-
- -T, --testing display changes entering testing"""
+ -e, --export export interesting files from source packages"""
sys.exit(exit_code)
@@ -155,26 +152,6 @@ def get_binary_uploads(suite, base_suite, session):
return session.execute(query, {'suite': suite, 'base_suite': base_suite})
-def testing_summary(summary, session):
- """
- Returns changes introduced in packages entering testing.
- """
-
- query = 'SELECT source, changelog FROM changelogs WHERE'
- fd = open(summary, 'r')
- for package in fd.read().splitlines():
- package = package.split()
- if package[1] != package[2]:
- if package[1] == '(not_in_testing)':
- package[1] = 0
- query += " source = '%s' AND version > '%s' AND version <= '%s'" \
- % (package[0], package[1], package[2])
- query += " AND architecture LIKE '%source%' OR"
- fd.close()
- query += ' False ORDER BY source, version DESC;'
-
- return session.execute(query)
-
def display_changes(uploads, index):
prev_upload = None
for upload in uploads:
@@ -266,10 +243,9 @@ def main():
('s','suite','Make-Changelog::Options::Suite','HasArg'),
('b','base-suite','Make-Changelog::Options::Base-Suite','HasArg'),
('n','binnmu','Make-Changelog::Options::binNMU'),
- ('e','export','Make-Changelog::Options::export'),
- ('T', 'testing','Make-Changelog::Options::Testing')]
+ ('e','export','Make-Changelog::Options::export')]
- for i in ['help', 'suite', 'base-suite', 'binnmu', 'export', 'testing']:
+ for i in ['help', 'suite', 'base-suite', 'binnmu', 'export']:
if not Cnf.has_key('Make-Changelog::Options::%s' % (i)):
Cnf['Make-Changelog::Options::%s' % (i)] = ''
@@ -279,20 +255,17 @@ def main():
base_suite = Cnf['Make-Changelog::Options::Base-Suite']
binnmu = Cnf['Make-Changelog::Options::binNMU']
export = Cnf['Make-Changelog::Options::export']
- testing = Cnf['Make-Changelog::Options::Testing']
- if Options['help'] or not (suite and base_suite) and not testing and not export:
+ if Options['help'] or not (suite and base_suite) and not export:
usage()
for s in suite, base_suite:
- if not testing and not export and not get_suite(s):
+ if not export and not get_suite(s):
utils.fubar('Invalid suite "%s"' % s)
session = DBConn().session()
- if testing:
- display_changes(testing_summary(Cnf['Changelogs::Testing'], session), 1)
- elif export:
+ if export:
if cnf.exportpath:
export_files(session, Cnf['Dir::Pool'], cnf.exportpath, Cnf['Dir::TempPath'])
else:
--
1.5.6.5
Reply to: