billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return changelog entry.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-05-26 19:43:46 +01:00
parent 8189e9189d
commit 0bdde4947d
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ognibuild/debian/build.py
View file

@ -157,7 +157,7 @@ def add_dummy_changelog_entry(
editor[0].distributions = suite editor[0].distributions = suite
def get_latest_changelog_version(local_tree, subpath=""): def get_latest_changelog_entry(local_tree, subpath=""):
if control_files_in_root(local_tree, subpath): if control_files_in_root(local_tree, subpath):
path = os.path.join(subpath, "changelog") path = os.path.join(subpath, "changelog")
else: else:
@ -246,11 +246,11 @@ def build_once(
retcode, shlex.split(build_command), retcode, shlex.split(build_command),
[], sbuild_failure.description) [], sbuild_failure.description)
(cl_package, cl_version) = get_latest_changelog_version(local_tree, subpath) cl_entry = get_latest_changelog_entry(local_tree, subpath)
changes_names = [] changes_names = []
for kind, entry in find_changes_files(output_directory, cl_package, cl_version): for kind, entry in find_changes_files(output_directory, cl_entry.package, cl_entry.version):
changes_names.append((entry.name)) changes_names.append((entry.name))
return (changes_names, cl_version) return (changes_names, cl_entry)
def gbp_dch(path): def gbp_dch(path):

4
ognibuild/debian/fix_build.py
View file

@ -681,7 +681,7 @@ def main(argv=None):
apt = AptManager(session) apt = AptManager(session)
try: try:
(changes_filenames, cl_version) = build_incrementally( (changes_filenames, cl_entry) = build_incrementally(
tree, tree,
apt, apt,
args.suffix, args.suffix,
@ -714,7 +714,7 @@ def main(argv=None):
logging.info( logging.info(
'Built %s - changes file at %r.', 'Built %s - changes file at %r.',
cl_version, changes_filenames) cl_entry.version, changes_filenames)
if __name__ == "__main__": if __name__ == "__main__":