commit: 2d40eb4b2e484efdd70f04ac237eb699ac54a98e
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Dec 8 22:18:56 2015 +0000
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org>
CommitDate: Tue Dec 8 22:18:56 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2d40eb4b
egencache: Delete support for deprecated --portdir and --portdir-overlay
options.
bin/egencache | 20 +-------------------
man/egencache.1 | 10 +---------
2 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/bin/egencache b/bin/egencache
index ab36bbe..7e3387e 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -1,5 +1,5 @@
#!/usr/bin/python -b
-# Copyright 2009-2014 Gentoo Foundation
+# Copyright 2009-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# unicode_literals for compat with TextIOWrapper in Python 2
@@ -113,12 +113,6 @@ def parse_args(args):
common.add_argument("--gpg-key",
help="override the PORTAGE_GPG_KEY variable",
dest="gpg_key")
- common.add_argument("--portdir",
- help="override the PORTDIR variable (deprecated in favor of
--repositories-configuration)",
- dest="portdir")
- common.add_argument("--portdir-overlay",
- help="override the PORTDIR_OVERLAY variable (deprecated in
favor of --repositories-configuration)",
- dest="portdir_overlay")
common.add_argument("--repositories-configuration",
help="override configuration of repositories (in format of
repos.conf)",
dest="repositories_configuration")
@@ -226,13 +220,6 @@ def parse_args(args):
parser.error("Write access denied: --cache-dir='%s'" % \
(options.cache_dir,))
- if options.portdir is not None:
- writemsg_level("egencache: warning: --portdir option is
deprecated in favor of --repositories-configuration option\n",
- level=logging.WARNING, noiselevel=-1)
- if options.portdir_overlay is not None:
- writemsg_level("egencache: warning: --portdir-overlay option is
deprecated in favor of --repositories-configuration option\n",
- level=logging.WARNING, noiselevel=-1)
-
for atom in args:
try:
atom = portage.dep.Atom(atom)
@@ -949,15 +936,10 @@ def egencache_main(args):
if options.repositories_configuration is not None:
env['PORTAGE_REPOSITORIES'] = options.repositories_configuration
- elif options.portdir_overlay is not None:
- env['PORTDIR_OVERLAY'] = options.portdir_overlay
if options.cache_dir is not None:
env['PORTAGE_DEPCACHEDIR'] = options.cache_dir
- if options.portdir is not None:
- env['PORTDIR'] = options.portdir
-
settings = portage.config(config_root=config_root,
local_config=False, env=env)
diff --git a/man/egencache.1 b/man/egencache.1
index 2465ddf..7fd17c2 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -1,4 +1,4 @@
-.TH "EGENCACHE" "1" "Mar 2015" "Portage VERSION" "Portage"
+.TH "EGENCACHE" "1" "Dec 2015" "Portage VERSION" "Portage"
.SH "NAME"
egencache \- generate metadata cache for ebuild repositories
.SH "SYNOPSIS"
@@ -71,14 +71,6 @@ Also see the related \fB\-\-load\-average\fR option.
.BR \-\-load\-average=LOAD
Specifies that maximum load allowed when spawning multiple jobs.
.TP
-.BR "\-\-portdir=PORTDIR"
-Override the PORTDIR variable. This option is deprecated in favor of
-\-\-repositories\-configuration option.
-.TP
-.BR "\-\-portdir\-overlay=PORTDIR_OVERLAY"
-Override the PORTDIR_OVERLAY variable. This option is deprecated in favor of
-\-\-repositories\-configuration option.
-.TP
.BR "\-\-preserve\-comments"
Preserve the comments found in the output use.local.desc file. This requires
the output file to exist before egencache is called.
