diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-02-10 21:42:57 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-02-10 21:42:57 -0800 |
| commit | e96a703a6d1e27681b0982c05d8d1389a035254d (patch) | |
| tree | 8ef3f7020d5484187f797a3e0bb0743e79926c90 | |
| parent | 2d08e6c4520556e5acc0055cdb3d68028eed3243 (diff) | |
| download | portage-e96a703a6d1e27681b0982c05d8d1389a035254d.tar.gz portage-e96a703a6d1e27681b0982c05d8d1389a035254d.tar.bz2 portage-e96a703a6d1e27681b0982c05d8d1389a035254d.zip | |
repoman: no ChangeLog for Manifest-only commit
Use --echangelog=force to force ChangeLog generation in this case.
See bug #398009.
| -rwxr-xr-x | bin/repoman | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/bin/repoman b/bin/repoman index 32111bddd..f3946eae5 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2463,6 +2463,15 @@ else: clnew = [elem[cdrlen:] for elem in mynew if elem.startswith(checkdir_relative)] clremoved = [elem[cdrlen:] for elem in myremoved if elem.startswith(checkdir_relative)] clchanged = [elem[cdrlen:] for elem in mychanged if elem.startswith(checkdir_relative)] + + # Skip ChangeLog generation if only the Manifest was modified, + # as discussed in bug #398009. + nontrivial_cl_files = set() + nontrivial_cl_files.update(clnew, clremoved, clchanged) + nontrivial_cl_files.difference_update(['Manifest']) + if not nontrivial_cl_files and options.echangelog != 'force': + continue + new_changelog = utilities.UpdateChangeLog(checkdir_relative, committer_name, changelog_msg, os.path.join(repodir, 'skel.ChangeLog'), |