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 1QFDhN-0001te-Cg for garchives@archives.gentoo.org; Wed, 27 Apr 2011 22:59:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAB381C00B; Wed, 27 Apr 2011 22:59:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 69E791C00B for ; Wed, 27 Apr 2011 22:59:00 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF52E1B401C for ; Wed, 27 Apr 2011 22:58:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 19B6E80505 for ; Wed, 27 Apr 2011 22:58:59 +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: <16cca624a56e9f5032c83b88e9b58349ac87319f.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/help.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 16cca624a56e9f5032c83b88e9b58349ac87319f Date: Wed, 27 Apr 2011 22:58:59 +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: 7423002cff8a07bd00a847a5712edd56 commit: 16cca624a56e9f5032c83b88e9b58349ac87319f Author: Zac Medico gentoo org> AuthorDate: Wed Apr 27 22:58:16 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Apr 27 22:58:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D16cca624 emerge: add --help for 3 new options --- pym/_emerge/help.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index a120f54..ffc81e9 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -550,6 +550,12 @@ def help(myopts, havecolor=3D1): print(" "+green("--nospinner")) print(" Disables the spinner regardless of terminal type.= ") print() + print(" " + green("--nousepkg-atoms") + " " + turquoise("ATOMS")= ) + desc =3D "A space separated list of package names or slot atoms." + \ + " Emerge will ignore matching binary packages." + for line in wrap(desc, desc_width): + print(desc_indent + line) + print() print(" "+green("--oneshot")+" ("+green("-1")+" short option)") print(" Emerge as normal, but don't add packages to the w= orld profile.") print(" This package will only be updated if it is depend= ed upon by") @@ -627,6 +633,13 @@ def help(myopts, havecolor=3D1): print(" not trigger reinstallation when flags that the us= er has not") print(" enabled are added or removed.") print() + print(" " + green("--reinstall-atoms") + " " + turquoise("ATOMS"= )) + desc =3D "A space separated list of package names or slot atoms. " + \ + "Emerge will treat matching packages as if they are not " + \ + "installed, and reinstall them if necessary." + for line in wrap(desc, desc_width): + print(desc_indent + line) + print() print(" "+green("--root=3DDIR")) desc =3D "Set the ROOT environment variable " + \ "which is documented in the emerge(1) man page." @@ -709,6 +722,13 @@ def help(myopts, havecolor=3D1): for line in wrap(desc, desc_width): print(desc_indent + line) print() + print(" " + green("--useoldpkg-atoms") + " " + turquoise("ATOMS"= )) + desc =3D "A space separated list of package names or slot atoms." + \ + " Emerge will prefer matching binary packages over newer" + \ + " unbuilt packages." + for line in wrap(desc, desc_width): + print(desc_indent + line) + print() print(" " + green("--usepkg") + \ " [ %s | %s ] (%s short option)" % \ (turquoise("y"), turquoise("n"), green("-k")))