From: Zac Medico Date: Sat, 11 Feb 2012 05:42:57 +0000 (-0800) Subject: repoman: no ChangeLog for Manifest-only commit X-Git-Tag: v2.2.0_alpha86~14 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e96a703a6d1e27681b0982c05d8d1389a035254d;p=portage.git repoman: no ChangeLog for Manifest-only commit Use --echangelog=force to force ChangeLog generation in this case. See bug #398009. --- 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'),