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 3A8871381F3 for ; Mon, 29 Apr 2013 04:27:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A021E0AD0; Mon, 29 Apr 2013 04:27:05 +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 DB828E0AD0 for ; Mon, 29 Apr 2013 04:27:04 +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 B95C933DD41 for ; Mon, 29 Apr 2013 04:27:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2EE03E4439 for ; Mon, 29 Apr 2013 04:27:02 +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: <1367209605.2bdc5c1230c8684e602f889e8b434a48b9c1701a.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: 2bdc5c1230c8684e602f889e8b434a48b9c1701a X-VCS-Branch: master Date: Mon, 29 Apr 2013 04:27:02 +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: 634e6375-a265-4827-86a7-cedad5833090 X-Archives-Hash: 94eb866a6654a4e7202e14e2905665a5 commit: 2bdc5c1230c8684e602f889e8b434a48b9c1701a Author: Zac Medico gentoo org> AuthorDate: Mon Apr 29 04:26:45 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Apr 29 04:26:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2bdc5c12 repoman: report --ignore/include-arches commits --- bin/repoman | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/bin/repoman b/bin/repoman index ca4fb53..a829334 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2680,11 +2680,20 @@ else: sys.stderr.flush() portage_version = "Unknown" + report_options = [] + if options.force: + report_options.append("--force") + if options.ignore_arches: + report_options.append("--ignore-arches") + if include_arches is not None: + report_options.append("--include-arches=\"%s\"" % + " ".join(sorted(include_arches))) + if vcs == "git": # Use new footer only for git (see bug #438364). commit_footer = "\n\nPackage-Manager: portage-%s" % portage_version - if options.force: - commit_footer += "\nRepoMan-Options: --force" + if report_options: + commit_footer += "\nRepoMan-Options: " + " ".join(report_options) if sign_manifests: commit_footer += "\nManifest-Sign-Key: %s" % (gpg_key, ) if dco_sob: @@ -2700,8 +2709,8 @@ else: commit_footer += "Signed-off-by: %s\n" % (dco_sob, ) commit_footer += "(Portage version: %s/%s/%s" % \ (portage_version, vcs, unameout) - if options.force: - commit_footer += ", RepoMan options: --force" + if report_options: + commit_footer += ", RepoMan options: " + " ".join(report_options) if sign_manifests: commit_footer += ", signed Manifest commit with key %s" % \ (gpg_key, )