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 1REkeB-00084b-SU for garchives@archives.gentoo.org; Fri, 14 Oct 2011 16:30:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A54C4E05B9; Fri, 14 Oct 2011 16:30:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 67330E05B9 for ; Fri, 14 Oct 2011 16:30:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C98C21B402C for ; Fri, 14 Oct 2011 16:30:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 08D9C80042 for ; Fri, 14 Oct 2011 16:30:03 +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: man/, pym/portage/package/ebuild/_config/, bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman man/repoman.1 pym/portage/package/ebuild/_config/special_env_vars.py X-VCS-Directories: man/ pym/portage/package/ebuild/_config/ bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: af2c4446880020871f7aaa0f3ff4f75707dd027e Date: Fri, 14 Oct 2011 16:30:03 +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: X-Archives-Hash: 5bb97377930c673885a953cb157b7678 commit: af2c4446880020871f7aaa0f3ff4f75707dd027e Author: Zac Medico gentoo org> AuthorDate: Fri Oct 14 16:29:37 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 14 16:29:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Daf2c4446 repoman: support REPOMAN_DEFAULT_OPTS variable --- bin/repoman | 9 +++++++++ man/repoman.1 | 3 +++ .../package/ebuild/_config/special_env_vars.py | 2 +- 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/bin/repoman b/bin/repoman index 38f9694..65c1f40 100755 --- a/bin/repoman +++ b/bin/repoman @@ -218,6 +218,10 @@ def ParseArgs(argv, qahelp): parser.add_option('-i', '--ignore-arches', dest=3D'ignore_arches', acti= on=3D'store_true', default=3DFalse, help=3D'ignore arch-specific failures (where arch !=3D= host)') =20 + parser.add_option("--ignore-default-opts", + action=3D"store_true", + help=3D"do not use the REPOMAN_DEFAULT_OPTS environment variable") + parser.add_option('-I', '--ignore-masked', dest=3D'ignore_masked', acti= on=3D'store_true', default=3DFalse, help=3D'ignore masked packages (not allowed with comm= it mode)') =20 @@ -247,6 +251,11 @@ def ParseArgs(argv, qahelp): =20 opts, args =3D parser.parse_args(argv[1:]) =20 + if not opts.ignore_default_opts: + default_opts =3D repoman_settings.get("REPOMAN_DEFAULT_OPTS", "").spli= t() + if default_opts: + opts, args =3D parser.parse_args(default_opts + sys.argv[1:]) + if opts.mode =3D=3D 'help': parser.print_help(short=3DFalse) =20 diff --git a/man/repoman.1 b/man/repoman.1 index f0c9eff..bc54657 100644 --- a/man/repoman.1 +++ b/man/repoman.1 @@ -47,6 +47,9 @@ Only check packages that have uncommitted modifications \fB\-i\fR, \fB\-\-ignore\-arches\fR Ignore arch-specific failures (where arch !=3D host) .TP +\fB\-\-ignore\-default\-opts\fR +Do not use the \fIREPOMAN_DEFAULT_OPTS\fR environment variable. +.TP \fB\-I\fR, \fB\-\-ignore\-masked\fR Ignore masked packages (not allowed with commit mode) .TP diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym= /portage/package/ebuild/_config/special_env_vars.py index 99321e2..517fdf3 100644 --- a/pym/portage/package/ebuild/_config/special_env_vars.py +++ b/pym/portage/package/ebuild/_config/special_env_vars.py @@ -157,7 +157,7 @@ environ_filter +=3D [ "PORTAGE_RSYNC_EXTRA_OPTS", "PORTAGE_RSYNC_OPTS", "PORTAGE_RSYNC_RETRIES", "PORTAGE_SYNC_STALE", "PORTAGE_USE", "PORT_LOGDIR", "PORT_LOGDIR_CLEAN", - "QUICKPKG_DEFAULT_OPTS", + "QUICKPKG_DEFAULT_OPTS", "REPOMAN_DEFAULT_OPTS", "RESUMECOMMAND", "RESUMECOMMAND_FTP", "RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTPS", "RESUMECOMMAND_RSYNC", "RESUMECOMMAND_SFTP",