From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EF78B1381F3 for ; Thu, 22 Aug 2013 02:19:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB74EE0BEF; Thu, 22 Aug 2013 02:19:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52C5EE0BEF for ; Thu, 22 Aug 2013 02:19:47 +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 3977133EC87 for ; Thu, 22 Aug 2013 02:19:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C309FE468F for ; Thu, 22 Aug 2013 02:19:43 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1377137959.94aed24784d5122c5bbd7afd6dd85ee83c10ab2e.zmedico@gentoo> 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: 94aed24784d5122c5bbd7afd6dd85ee83c10ab2e X-VCS-Branch: master Date: Thu, 22 Aug 2013 02:19:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1f3799fc-45a3-4c71-a1f9-57859ae75621 X-Archives-Hash: 5100a2c8f41f9044ef18e055f4aab5ab commit: 94aed24784d5122c5bbd7afd6dd85ee83c10ab2e Author: Zac Medico gentoo org> AuthorDate: Thu Aug 22 02:19:19 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Aug 22 02:19:19 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=94aed247 repoman: fix manifest for --echangelog --- bin/repoman | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/repoman b/bin/repoman index 31ae747..5250af0 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2719,6 +2719,7 @@ else: commitmessage += commit_footer + broken_changelog_manifests = [] if options.echangelog in ('y', 'force'): logging.info("checking for unmodified ChangeLog files") committer_name = utilities.get_committer_name(env=repoman_settings) @@ -2774,6 +2775,8 @@ else: # regenerate Manifest for modified ChangeLog (bug #420735) repoman_settings["O"] = checkdir digestgen(mysettings=repoman_settings, myportdb=portdb) + else: + broken_changelog_manifests.append(x) if myautoadd: print(">>> Auto-Adding missing Manifest/ChangeLog file(s)...") @@ -3003,6 +3006,11 @@ else: repoman_settings["O"] = os.path.join(repodir, x) digestgen(mysettings=repoman_settings, myportdb=portdb) + elif broken_changelog_manifests: + for x in broken_changelog_manifests: + repoman_settings["O"] = os.path.join(repodir, x) + digestgen(mysettings=repoman_settings, myportdb=portdb) + signed = False if sign_manifests: signed = True