Usage:
make-changelog -s <suite> -b <base_suite> [OPTION]...
- make-changelog -e
+ make-changelog -e -a <archive>
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"""
+ -e, --export export interesting files from source packages
+ -a, --archive archive to fetch data from
+ -p, --progress display progress status"""
sys.exit(exit_code)
print upload[index]
prev_upload = upload[0]
-def export_files(session, pool, clpool, temppath):
+def export_files(session, archive, clpool, progress=False):
"""
Export interesting files from source packages.
"""
+ pool = os.path.join(archive.path, 'pool')
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
+ query = """SELECT DISTINCT s.source, su.suite_name AS suite, s.version, c.name || '/' || f.filename AS 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
+ JOIN files_archive_map fam ON f.id = fam.file_id AND fam.archive_id = su.archive_id
+ JOIN component c ON fam.component_id = c.id
+ WHERE su.archive_id = :archive_id
ORDER BY s.source, suite"""
- for p in session.execute(query):
+ for p in session.execute(query, {'archive_id': archive.archive_id}):
if not sources.has_key(p[0]):
sources[p[0]] = {}
sources[p[0]][p[1]] = (re_no_epoch.sub('', p[2]), p[3])
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]))):
+ '%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)
unpacked = UnpackedSource(p)
tempdir = unpacked.get_root_directory()
stats['unpack'] += 1
+ if progress:
+ if stats['unpack'] % 100 == 0:
+ sys.stderr.write('%d packages unpacked\n' % stats['unpack'])
+ elif stats['unpack'] % 10 == 0:
+ sys.stderr.write('.')
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' \
+ suite = os.path.join(unpack[p][0], '%s_%s' \
% (s, os.path.basename(f)))
- version = os.path.join(unpack[p][0], '%s_%s.%s' % \
+ 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)
os.link(version, suite)
stats['created'] += 1
unpacked.cleanup()
- except Exception, e:
+ except Exception as e:
print 'make-changelog: unable to unpack %s\n%s' % (p, e)
stats['errors'] += 1
Cnf = utils.get_conf()
cnf = Config()
Arguments = [('h','help','Make-Changelog::Options::Help'),
+ ('a','archive','Make-Changelog::Options::Archive','HasArg'),
('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')]
+ ('e','export','Make-Changelog::Options::export'),
+ ('p','progress','Make-Changelog::Options::progress')]
- for i in ['help', 'suite', 'base-suite', 'binnmu', 'export']:
+ for i in ['help', 'suite', 'base-suite', 'binnmu', 'export', 'progress']:
if not Cnf.has_key('Make-Changelog::Options::%s' % (i)):
Cnf['Make-Changelog::Options::%s' % (i)] = ''
- apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
- Options = Cnf.SubTree('Make-Changelog::Options')
+ apt_pkg.parse_commandline(Cnf, Arguments, sys.argv)
+ Options = Cnf.subtree('Make-Changelog::Options')
suite = Cnf['Make-Changelog::Options::Suite']
base_suite = Cnf['Make-Changelog::Options::Base-Suite']
binnmu = Cnf['Make-Changelog::Options::binNMU']
export = Cnf['Make-Changelog::Options::export']
+ progress = Cnf['Make-Changelog::Options::progress']
if Options['help'] or not (suite and base_suite) and not export:
usage()
if export:
if cnf.exportpath:
+ archive = session.query(Archive).filter_by(archive_name=Options['Archive']).one()
exportpath = os.path.join(Cnf['Dir::Export'], cnf.exportpath)
- export_files(session, Cnf['Dir::Pool'], exportpath, Cnf['Dir::TempPath'])
+ export_files(session, archive, exportpath, progress)
else:
utils.fubar('No changelog export path defined')
elif binnmu: