| 1 |
commit: 2d40eb4b2e484efdd70f04ac237eb699ac54a98e |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Tue Dec 8 22:18:56 2015 +0000 |
| 4 |
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org> |
| 5 |
CommitDate: Tue Dec 8 22:18:56 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2d40eb4b |
| 7 |
|
| 8 |
egencache: Delete support for deprecated --portdir and --portdir-overlay options. |
| 9 |
|
| 10 |
bin/egencache | 20 +------------------- |
| 11 |
man/egencache.1 | 10 +--------- |
| 12 |
2 files changed, 2 insertions(+), 28 deletions(-) |
| 13 |
|
| 14 |
diff --git a/bin/egencache b/bin/egencache |
| 15 |
index ab36bbe..7e3387e 100755 |
| 16 |
--- a/bin/egencache |
| 17 |
+++ b/bin/egencache |
| 18 |
@@ -1,5 +1,5 @@ |
| 19 |
#!/usr/bin/python -b |
| 20 |
-# Copyright 2009-2014 Gentoo Foundation |
| 21 |
+# Copyright 2009-2015 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
# unicode_literals for compat with TextIOWrapper in Python 2 |
| 25 |
@@ -113,12 +113,6 @@ def parse_args(args): |
| 26 |
common.add_argument("--gpg-key", |
| 27 |
help="override the PORTAGE_GPG_KEY variable", |
| 28 |
dest="gpg_key") |
| 29 |
- common.add_argument("--portdir", |
| 30 |
- help="override the PORTDIR variable (deprecated in favor of --repositories-configuration)", |
| 31 |
- dest="portdir") |
| 32 |
- common.add_argument("--portdir-overlay", |
| 33 |
- help="override the PORTDIR_OVERLAY variable (deprecated in favor of --repositories-configuration)", |
| 34 |
- dest="portdir_overlay") |
| 35 |
common.add_argument("--repositories-configuration", |
| 36 |
help="override configuration of repositories (in format of repos.conf)", |
| 37 |
dest="repositories_configuration") |
| 38 |
@@ -226,13 +220,6 @@ def parse_args(args): |
| 39 |
parser.error("Write access denied: --cache-dir='%s'" % \ |
| 40 |
(options.cache_dir,)) |
| 41 |
|
| 42 |
- if options.portdir is not None: |
| 43 |
- writemsg_level("egencache: warning: --portdir option is deprecated in favor of --repositories-configuration option\n", |
| 44 |
- level=logging.WARNING, noiselevel=-1) |
| 45 |
- if options.portdir_overlay is not None: |
| 46 |
- writemsg_level("egencache: warning: --portdir-overlay option is deprecated in favor of --repositories-configuration option\n", |
| 47 |
- level=logging.WARNING, noiselevel=-1) |
| 48 |
- |
| 49 |
for atom in args: |
| 50 |
try: |
| 51 |
atom = portage.dep.Atom(atom) |
| 52 |
@@ -949,15 +936,10 @@ def egencache_main(args): |
| 53 |
|
| 54 |
if options.repositories_configuration is not None: |
| 55 |
env['PORTAGE_REPOSITORIES'] = options.repositories_configuration |
| 56 |
- elif options.portdir_overlay is not None: |
| 57 |
- env['PORTDIR_OVERLAY'] = options.portdir_overlay |
| 58 |
|
| 59 |
if options.cache_dir is not None: |
| 60 |
env['PORTAGE_DEPCACHEDIR'] = options.cache_dir |
| 61 |
|
| 62 |
- if options.portdir is not None: |
| 63 |
- env['PORTDIR'] = options.portdir |
| 64 |
- |
| 65 |
settings = portage.config(config_root=config_root, |
| 66 |
local_config=False, env=env) |
| 67 |
|
| 68 |
|
| 69 |
diff --git a/man/egencache.1 b/man/egencache.1 |
| 70 |
index 2465ddf..7fd17c2 100644 |
| 71 |
--- a/man/egencache.1 |
| 72 |
+++ b/man/egencache.1 |
| 73 |
@@ -1,4 +1,4 @@ |
| 74 |
-.TH "EGENCACHE" "1" "Mar 2015" "Portage VERSION" "Portage" |
| 75 |
+.TH "EGENCACHE" "1" "Dec 2015" "Portage VERSION" "Portage" |
| 76 |
.SH "NAME" |
| 77 |
egencache \- generate metadata cache for ebuild repositories |
| 78 |
.SH "SYNOPSIS" |
| 79 |
@@ -71,14 +71,6 @@ Also see the related \fB\-\-load\-average\fR option. |
| 80 |
.BR \-\-load\-average=LOAD |
| 81 |
Specifies that maximum load allowed when spawning multiple jobs. |
| 82 |
.TP |
| 83 |
-.BR "\-\-portdir=PORTDIR" |
| 84 |
-Override the PORTDIR variable. This option is deprecated in favor of |
| 85 |
-\-\-repositories\-configuration option. |
| 86 |
-.TP |
| 87 |
-.BR "\-\-portdir\-overlay=PORTDIR_OVERLAY" |
| 88 |
-Override the PORTDIR_OVERLAY variable. This option is deprecated in favor of |
| 89 |
-\-\-repositories\-configuration option. |
| 90 |
-.TP |
| 91 |
.BR "\-\-preserve\-comments" |
| 92 |
Preserve the comments found in the output use.local.desc file. This requires |
| 93 |
the output file to exist before egencache is called. |
Archives