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 1RJzZA-0003Po-D2 for garchives@archives.gentoo.org; Sat, 29 Oct 2011 03:26:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FE17E02CE; Sat, 29 Oct 2011 03:26:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0843BE02CE for ; Sat, 29 Oct 2011 03:26:32 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6763A1B4023 for ; Sat, 29 Oct 2011 03:26:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D0BAE80042 for ; Sat, 29 Oct 2011 03:26:31 +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/portageq X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c7a9678751251c027a3b2072962be49865c2c6f2 Date: Sat, 29 Oct 2011 03:26:31 +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: 0180bd2c227a383cf4366fb6390eee10 commit: c7a9678751251c027a3b2072962be49865c2c6f2 Author: Zac Medico gentoo org> AuthorDate: Sat Oct 29 03:26:18 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Oct 29 03:26:18 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc7a96787 portageq: refer to instead of Since commit a715b65f7bd36409c1283e6911265d1f4405ab7a, portageq takes EROOT as the first argument of commands that require a root argument. So, update the docs to refer to instead of . --- bin/portageq | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bin/portageq b/bin/portageq index 66f6509..cee343f 100755 --- a/bin/portageq +++ b/bin/portageq @@ -79,7 +79,7 @@ def eval_atom_use(atom): # =20 def has_version(argv): - """ + """ Return code 0 if it's available, 1 otherwise. """ if (len(argv) < 2): @@ -126,7 +126,7 @@ has_version.uses_root =3D True =20 =20 def best_version(argv): - """ + """ Returns category/package-version (without .ebuild). """ if (len(argv) < 2): @@ -166,7 +166,7 @@ best_version.uses_root =3D True =20 =20 def mass_best_version(argv): - """ []+ + """ []+ Returns category/package-version (without .ebuild). """ if (len(argv) < 2): @@ -204,7 +204,7 @@ def metadata(argv): sys.exit(1) =20 metadata.__doc__ =3D """ - []+ + []+ Returns metadata values for the specified package. Available keys: %s """ % ','.join(sorted(x for x in portage.auxdbkeys \ @@ -213,10 +213,10 @@ if not x.startswith('UNUSED_'))) metadata.uses_root =3D True =20 def contents(argv): - """ + """ List the files that are installed for a given package, with one file listed on each line. All file names will begin with - . + . """ if len(argv) !=3D 2: print("ERROR: expected 2 parameters, got %d!" % len(argv)) @@ -235,11 +235,11 @@ def contents(argv): contents.uses_root =3D True =20 def owners(argv): - """ []+ + """ []+ Given a list of files, print the packages that own the files and which files belong to each package. Files owned by a package are listed on the lines below it, indented by a single tab character (\\t). All file - paths must either start with or be a basename alone. + paths must either start with or be a basename alone. Returns 1 if no owners could be found, and 0 otherwise. """ if len(argv) < 2: @@ -272,7 +272,7 @@ def owners(argv): f =3D os.path.join(cwd, f) f =3D portage.normalize_path(f) if not is_basename and not f.startswith(eroot): - sys.stderr.write("ERROR: file paths must begin with !\n") + sys.stderr.write("ERROR: file paths must begin with !\n") sys.stderr.flush() return 2 if is_basename: @@ -316,9 +316,9 @@ def owners(argv): owners.uses_root =3D True =20 def is_protected(argv): - """ + """ Given a single filename, return code 0 if it's protected, 1 otherwise. - The filename must begin with . + The filename must begin with . """ if len(argv) !=3D 2: sys.stderr.write("ERROR: expected 2 parameters, got %d!\n" % len(argv)= ) @@ -344,7 +344,7 @@ def is_protected(argv): f =3D portage.normalize_path(f) =20 if not f.startswith(root): - err.write("ERROR: file paths must begin with !\n") + err.write("ERROR: file paths must begin with !\n") err.flush() return 2 =20 @@ -363,9 +363,9 @@ def is_protected(argv): is_protected.uses_root =3D True =20 def filter_protected(argv): - """ + """ Read filenames from stdin and write them to stdout if they are protecte= d. - All filenames are delimited by \\n and must begin with . + All filenames are delimited by \\n and must begin with . """ if len(argv) !=3D 1: sys.stderr.write("ERROR: expected 1 parameter, got %d!\n" % len(argv)) @@ -405,7 +405,7 @@ def filter_protected(argv): f =3D portage.normalize_path(f) =20 if not f.startswith(root): - err.write("ERROR: file paths must begin with !\n") + err.write("ERROR: file paths must begin with !\n") err.flush() errors +=3D 1 continue @@ -423,7 +423,7 @@ def filter_protected(argv): filter_protected.uses_root =3D True =20 def best_visible(argv): - """ [pkgtype] + """ [pkgtype] Returns category/package-version (without .ebuild). The pkgtype argument defaults to "ebuild" if unspecified, otherwise it must be one of ebuild, binary, or installed. @@ -503,7 +503,7 @@ best_visible.uses_root =3D True =20 =20 def mass_best_visible(argv): - """ []+ + """ []+ Returns category/package-version (without .ebuild). """ if (len(argv) < 2): @@ -519,7 +519,7 @@ mass_best_visible.uses_root =3D True =20 =20 def all_best_visible(argv): - """ + """ Returns all best_visible packages (without .ebuild). """ if len(argv) < 1: @@ -536,7 +536,7 @@ all_best_visible.uses_root =3D True =20 =20 def match(argv): - """ + """ Returns a \\n separated list of category/package-version. When given an empty string, all installed packages will be listed. @@ -586,7 +586,7 @@ def match(argv): match.uses_root =3D True =20 def expand_virtual(argv): - """ + """ Returns a \\n separated list of atoms expanded from a given virtual atom (GLEP 37 virtuals only), excluding blocker atoms. Satisfied @@ -700,8 +700,8 @@ def envvar(argv): print(portage.settings[arg]) =20 def get_repos(argv): - """ - Returns all repos with names (repo_name file) argv[0] =3D $ROOT + """ + Returns all repos with names (repo_name file) argv[0] =3D $EROOT """ if len(argv) < 1: print("ERROR: insufficient parameters!") @@ -709,8 +709,8 @@ def get_repos(argv): print(" ".join(portage.db[argv[0]]["porttree"].dbapi.getRepositories())= ) =20 def get_repo_path(argv): - """ + - Returns the path to the repo named argv[1], argv[0] =3D $ROOT + """ + + Returns the path to the repo named argv[1], argv[0] =3D $EROOT """ if len(argv) < 2: print("ERROR: insufficient parameters!") @@ -722,7 +722,7 @@ def get_repo_path(argv): print(path) =20 def list_preserved_libs(argv): - """ + """ Print a list of libraries preserved during a package update in the form package: path. Returns 1 if no preserved libraries could be found, 0 otherwise.