commit: 9716f8a19707f89da8e7caeb5427a16804d5b220
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Dec 8 22:21:32 2015 +0000
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org>
CommitDate: Tue Dec 8 22:21:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9716f8a1
emirrordist: Delete support for deprecated --portdir and --portdir-overlay
options.
man/emirrordist.1 | 10 +---------
pym/portage/_emirrordist/main.py | 23 +----------------------
2 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/man/emirrordist.1 b/man/emirrordist.1
index 2c93830..6e6c508 100644
--- a/man/emirrordist.1
+++ b/man/emirrordist.1
@@ -1,4 +1,4 @@
-.TH "EMIRRORDIST" "1" "Jul 2013" "Portage VERSION" "Portage"
+.TH "EMIRRORDIST" "1" "Dec 2015" "Portage VERSION" "Portage"
.SH "NAME"
emirrordist \- a fetch tool for mirroring of package distfiles
.SH SYNOPSIS
@@ -47,14 +47,6 @@ Name of repo to operate on.
\fB\-\-config\-root\fR=\fIDIR\fR
Location of portage config files.
.TP
-\fB\-\-portdir\fR=\fIDIR\fR
-Override the PORTDIR variable. This option is deprecated in favor of
-\-\-repositories\-configuration option.
-.TP
-\fB\-\-portdir\-overlay\fR=\fIPORTDIR_OVERLAY\fR
-Override the PORTDIR_OVERLAY variable. This option is deprecated in favor of
-\-\-repositories\-configuration option.
-.TP
\fB\-\-repositories\-configuration\fR=\fIREPOSITORIES_CONFIGURATION\fR
Override configuration of repositories. The argument of this option has
the same format as repos.conf (see \fBportage\fR(5)).
diff --git a/pym/portage/_emirrordist/main.py b/pym/portage/_emirrordist/main.py
index 7378ac7..b63837b 100644
--- a/pym/portage/_emirrordist/main.py
+++ b/pym/portage/_emirrordist/main.py
@@ -1,4 +1,4 @@
-# Copyright 2013-2014 Gentoo Foundation
+# Copyright 2013-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
import argparse
@@ -74,15 +74,6 @@ common_options = (
"metavar" : "DIR"
},
{
- "longopt" : "--portdir",
- "help" : "override the PORTDIR variable (deprecated in
favor of --repositories-configuration)",
- "metavar" : "DIR"
- },
- {
- "longopt" : "--portdir-overlay",
- "help" : "override the PORTDIR_OVERLAY variable (deprecated
in favor of --repositories-configuration)"
- },
- {
"longopt" : "--repositories-configuration",
"help" : "override configuration of repositories (in format
of repos.conf)"
},
@@ -245,20 +236,8 @@ def emirrordist_main(args):
config_root = options.config_root
- if options.portdir is not None:
- writemsg_level("emirrordist: 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("emirrordist: warning: --portdir-overlay option
is deprecated in favor of --repositories-configuration option\n",
- level=logging.WARNING, noiselevel=-1)
-
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.portdir is not None:
- env['PORTDIR'] = options.portdir
settings = portage.config(config_root=config_root,
local_config=False, env=env)
