| 1 |
commit: e96a703a6d1e27681b0982c05d8d1389a035254d |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 11 05:42:57 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 11 05:42:57 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e96a703a |
| 7 |
|
| 8 |
repoman: no ChangeLog for Manifest-only commit |
| 9 |
|
| 10 |
Use --echangelog=force to force ChangeLog generation in this case. |
| 11 |
See bug #398009. |
| 12 |
|
| 13 |
--- |
| 14 |
bin/repoman | 9 +++++++++ |
| 15 |
1 files changed, 9 insertions(+), 0 deletions(-) |
| 16 |
|
| 17 |
diff --git a/bin/repoman b/bin/repoman |
| 18 |
index 32111bd..f3946ea 100755 |
| 19 |
--- a/bin/repoman |
| 20 |
+++ b/bin/repoman |
| 21 |
@@ -2463,6 +2463,15 @@ else: |
| 22 |
clnew = [elem[cdrlen:] for elem in mynew if elem.startswith(checkdir_relative)] |
| 23 |
clremoved = [elem[cdrlen:] for elem in myremoved if elem.startswith(checkdir_relative)] |
| 24 |
clchanged = [elem[cdrlen:] for elem in mychanged if elem.startswith(checkdir_relative)] |
| 25 |
+ |
| 26 |
+ # Skip ChangeLog generation if only the Manifest was modified, |
| 27 |
+ # as discussed in bug #398009. |
| 28 |
+ nontrivial_cl_files = set() |
| 29 |
+ nontrivial_cl_files.update(clnew, clremoved, clchanged) |
| 30 |
+ nontrivial_cl_files.difference_update(['Manifest']) |
| 31 |
+ if not nontrivial_cl_files and options.echangelog != 'force': |
| 32 |
+ continue |
| 33 |
+ |
| 34 |
new_changelog = utilities.UpdateChangeLog(checkdir_relative, |
| 35 |
committer_name, changelog_msg, |
| 36 |
os.path.join(repodir, 'skel.ChangeLog'), |
Archives