From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rw5kF-0000W7-KY for garchives@archives.gentoo.org; Sat, 11 Feb 2012 05:43:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFEFBE062D; Sat, 11 Feb 2012 05:43:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9A75EE062D for ; Sat, 11 Feb 2012 05:43:25 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CFFA1B400E for ; Sat, 11 Feb 2012 05:43:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9AE1DE53FF for ; Sat, 11 Feb 2012 05:43:23 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e96a703a6d1e27681b0982c05d8d1389a035254d Date: Sat, 11 Feb 2012 05:43:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: cafe8980-a7b2-41de-a4ef-58d6e91146f3 X-Archives-Hash: 3b5d9e27a2bf56fc2d430bcc3d94ce00 commit: e96a703a6d1e27681b0982c05d8d1389a035254d Author: Zac Medico gentoo org> AuthorDate: Sat Feb 11 05:42:57 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Feb 11 05:42:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De96a703a repoman: no ChangeLog for Manifest-only commit Use --echangelog=3Dforce to force ChangeLog generation in this case. See bug #398009. --- bin/repoman | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/bin/repoman b/bin/repoman index 32111bd..f3946ea 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2463,6 +2463,15 @@ else: clnew =3D [elem[cdrlen:] for elem in mynew if elem.startswith(checkdi= r_relative)] clremoved =3D [elem[cdrlen:] for elem in myremoved if elem.startswith= (checkdir_relative)] clchanged =3D [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 =3D set() + nontrivial_cl_files.update(clnew, clremoved, clchanged) + nontrivial_cl_files.difference_update(['Manifest']) + if not nontrivial_cl_files and options.echangelog !=3D 'force': + continue + new_changelog =3D utilities.UpdateChangeLog(checkdir_relative, committer_name, changelog_msg, os.path.join(repodir, 'skel.ChangeLog'),