X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_changelog.py;h=ac5581d02be8ae43a3de98d4145a1ef1a49cb7f3;hb=f74884ed707584673bc2066427fa94f3b348d065;hp=0c08a44215bb8b7a8e18cdbcc6996529d11bb603;hpb=e1639df2110d39f4906fb9c00f4a6ed80d4d52fb;p=dak.git diff --git a/dak/make_changelog.py b/dak/make_changelog.py index 0c08a442..ac5581d0 100755 --- a/dak/make_changelog.py +++ b/dak/make_changelog.py @@ -49,10 +49,16 @@ Generate changelog entry between two suites ################################################################################ +import os import sys import apt_pkg +from glob import glob +from shutil import rmtree from daklib.dbconn import * from daklib import utils +from daklib.config import Config +from daklib.contents import UnpackedSource +from daklib.regexes import re_no_epoch ################################################################################ @@ -61,7 +67,7 @@ def usage (exit_code=0): Usage: make-changelog -s -b [OPTION]... - make-changelog -T + make-changelog -e Options: @@ -69,7 +75,8 @@ Options: -s, --suite suite providing packages to compare -b, --base-suite suite to be taken as reference for comparison -n, --binnmu display binNMUs uploads instead of source ones - -T, --testing display changes entering testing""" + + -e, --export export interesting files from source packages""" sys.exit(exit_code) @@ -145,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: @@ -173,15 +160,106 @@ def display_changes(uploads, index): print upload[index] prev_upload = upload[0] +def export_files(session, pool, clpool): + """ + Export interesting files from source packages. + """ + + sources = {} + unpack = {} + files = ('changelog', 'copyright', 'NEWS.Debian', 'README.Debian') + stats = {'unpack': 0, 'created': 0, 'removed': 0, 'errors': 0, 'files': 0} + query = """SELECT DISTINCT s.source, su.suite_name AS suite, s.version, f.filename + FROM source s + JOIN newest_source n ON n.source = s.source AND n.version = s.version + JOIN src_associations sa ON sa.source = s.id + JOIN suite su ON su.id = sa.suite + JOIN files f ON f.id = s.file + ORDER BY s.source, suite""" + + for p in session.execute(query): + if not sources.has_key(p[0]): + sources[p[0]] = {} + sources[p[0]][p[1]] = (re_no_epoch.sub('', p[2]), p[3]) + + for p in sources.keys(): + for s in sources[p].keys(): + path = os.path.join(clpool, '/'.join(sources[p][s][1].split('/')[:-1])) + if not os.path.exists(path): + os.makedirs(path) + if not os.path.exists(os.path.join(path, \ + '%s_%s.changelog' % (p, sources[p][s][0]))): + if not unpack.has_key(os.path.join(pool, sources[p][s][1])): + unpack[os.path.join(pool, sources[p][s][1])] = (path, set()) + unpack[os.path.join(pool, sources[p][s][1])][1].add(s) + else: + for file in glob('%s/%s_%s*' % (path, p, sources[p][s][0])): + link = '%s%s' % (s, file.split('%s_%s' \ + % (p, sources[p][s][0]))[1]) + try: + os.unlink(os.path.join(path, link)) + except OSError: + pass + os.link(os.path.join(path, file), os.path.join(path, link)) + + for p in unpack.keys(): + package = os.path.splitext(os.path.basename(p))[0].split('_') + try: + unpacked = UnpackedSource(p) + tempdir = unpacked.get_root_directory() + stats['unpack'] += 1 + for file in files: + for f in glob(os.path.join(tempdir, 'debian', '*%s' % file)): + for s in unpack[p][1]: + suite = os.path.join(unpack[p][0], '%s.%s' \ + % (s, os.path.basename(f))) + version = os.path.join(unpack[p][0], '%s_%s.%s' % \ + (package[0], package[1], os.path.basename(f))) + if not os.path.exists(version): + os.link(f, version) + stats['created'] += 1 + try: + os.unlink(suite) + except OSError: + pass + os.link(version, suite) + stats['created'] += 1 + unpacked.cleanup() + except Exception, e: + print 'make-changelog: unable to unpack %s\n%s' % (p, e) + stats['errors'] += 1 + + for root, dirs, files in os.walk(clpool): + if len(files): + if root.split('/')[-1] not in sources.keys(): + if os.path.exists(root): + rmtree(root) + stats['removed'] += 1 + for file in files: + if os.path.exists(os.path.join(root, file)): + if os.stat(os.path.join(root, file)).st_nlink == 1: + os.unlink(os.path.join(root, file)) + stats['removed'] += 1 + + for root, dirs, files in os.walk(clpool): + stats['files'] += len(files) + print 'make-changelog: file exporting finished' + print ' * New packages unpacked: %d' % stats['unpack'] + print ' * New files created: %d' % stats['created'] + print ' * New files removed: %d' % stats['removed'] + print ' * Unpack errors: %d' % stats['errors'] + print ' * Files available into changelog pool: %d' % stats['files'] + 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'), ('n','binnmu','Make-Changelog::Options::binNMU'), - ('T', 'testing','Make-Changelog::Options::Testing')] + ('e','export','Make-Changelog::Options::export')] - for i in ['help', 'suite', 'base-suite', 'binnmu', '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)] = '' @@ -190,19 +268,23 @@ def main(): suite = Cnf['Make-Changelog::Options::Suite'] base_suite = Cnf['Make-Changelog::Options::Base-Suite'] binnmu = Cnf['Make-Changelog::Options::binNMU'] - testing = Cnf['Make-Changelog::Options::Testing'] + export = Cnf['Make-Changelog::Options::export'] - if Options['help'] or not (suite and base_suite) and not testing: + if Options['help'] or not (suite and base_suite) and not export: usage() for s in suite, base_suite: - if not testing 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) + if export: + if cnf.exportpath: + exportpath = os.path.join(Cnf['Dir::Export'], cnf.exportpath) + export_files(session, Cnf['Dir::Pool'], exportpath) + else: + utils.fubar('No changelog export path defined') elif binnmu: display_changes(get_binary_uploads(suite, base_suite, session), 3) else: