diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2015-12-08 23:18:56 +0100 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2015-12-08 23:18:56 +0100 |
| commit | 2d40eb4b2e484efdd70f04ac237eb699ac54a98e (patch) | |
| tree | b6a0a7acab90bd9043bd6663ee0d97cfc347b721 /bin/egencache | |
| parent | ebuild: Rename some variables. (diff) | |
| download | portage-2d40eb4b2e484efdd70f04ac237eb699ac54a98e.tar.gz portage-2d40eb4b2e484efdd70f04ac237eb699ac54a98e.tar.bz2 portage-2d40eb4b2e484efdd70f04ac237eb699ac54a98e.zip | |
egencache: Delete support for deprecated --portdir and --portdir-overlay options.
Diffstat (limited to 'bin/egencache')
| -rwxr-xr-x | bin/egencache | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/bin/egencache b/bin/egencache index ab36bbea7..7e3387ed9 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) |