| 1 |
commit: 9716f8a19707f89da8e7caeb5427a16804d5b220 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Tue Dec 8 22:21:32 2015 +0000 |
| 4 |
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org> |
| 5 |
CommitDate: Tue Dec 8 22:21:32 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9716f8a1 |
| 7 |
|
| 8 |
emirrordist: Delete support for deprecated --portdir and --portdir-overlay options. |
| 9 |
|
| 10 |
man/emirrordist.1 | 10 +--------- |
| 11 |
pym/portage/_emirrordist/main.py | 23 +---------------------- |
| 12 |
2 files changed, 2 insertions(+), 31 deletions(-) |
| 13 |
|
| 14 |
diff --git a/man/emirrordist.1 b/man/emirrordist.1 |
| 15 |
index 2c93830..6e6c508 100644 |
| 16 |
--- a/man/emirrordist.1 |
| 17 |
+++ b/man/emirrordist.1 |
| 18 |
@@ -1,4 +1,4 @@ |
| 19 |
-.TH "EMIRRORDIST" "1" "Jul 2013" "Portage VERSION" "Portage" |
| 20 |
+.TH "EMIRRORDIST" "1" "Dec 2015" "Portage VERSION" "Portage" |
| 21 |
.SH "NAME" |
| 22 |
emirrordist \- a fetch tool for mirroring of package distfiles |
| 23 |
.SH SYNOPSIS |
| 24 |
@@ -47,14 +47,6 @@ Name of repo to operate on. |
| 25 |
\fB\-\-config\-root\fR=\fIDIR\fR |
| 26 |
Location of portage config files. |
| 27 |
.TP |
| 28 |
-\fB\-\-portdir\fR=\fIDIR\fR |
| 29 |
-Override the PORTDIR variable. This option is deprecated in favor of |
| 30 |
-\-\-repositories\-configuration option. |
| 31 |
-.TP |
| 32 |
-\fB\-\-portdir\-overlay\fR=\fIPORTDIR_OVERLAY\fR |
| 33 |
-Override the PORTDIR_OVERLAY variable. This option is deprecated in favor of |
| 34 |
-\-\-repositories\-configuration option. |
| 35 |
-.TP |
| 36 |
\fB\-\-repositories\-configuration\fR=\fIREPOSITORIES_CONFIGURATION\fR |
| 37 |
Override configuration of repositories. The argument of this option has |
| 38 |
the same format as repos.conf (see \fBportage\fR(5)). |
| 39 |
|
| 40 |
diff --git a/pym/portage/_emirrordist/main.py b/pym/portage/_emirrordist/main.py |
| 41 |
index 7378ac7..b63837b 100644 |
| 42 |
--- a/pym/portage/_emirrordist/main.py |
| 43 |
+++ b/pym/portage/_emirrordist/main.py |
| 44 |
@@ -1,4 +1,4 @@ |
| 45 |
-# Copyright 2013-2014 Gentoo Foundation |
| 46 |
+# Copyright 2013-2015 Gentoo Foundation |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
|
| 49 |
import argparse |
| 50 |
@@ -74,15 +74,6 @@ common_options = ( |
| 51 |
"metavar" : "DIR" |
| 52 |
}, |
| 53 |
{ |
| 54 |
- "longopt" : "--portdir", |
| 55 |
- "help" : "override the PORTDIR variable (deprecated in favor of --repositories-configuration)", |
| 56 |
- "metavar" : "DIR" |
| 57 |
- }, |
| 58 |
- { |
| 59 |
- "longopt" : "--portdir-overlay", |
| 60 |
- "help" : "override the PORTDIR_OVERLAY variable (deprecated in favor of --repositories-configuration)" |
| 61 |
- }, |
| 62 |
- { |
| 63 |
"longopt" : "--repositories-configuration", |
| 64 |
"help" : "override configuration of repositories (in format of repos.conf)" |
| 65 |
}, |
| 66 |
@@ -245,20 +236,8 @@ def emirrordist_main(args): |
| 67 |
|
| 68 |
config_root = options.config_root |
| 69 |
|
| 70 |
- if options.portdir is not None: |
| 71 |
- writemsg_level("emirrordist: warning: --portdir option is deprecated in favor of --repositories-configuration option\n", |
| 72 |
- level=logging.WARNING, noiselevel=-1) |
| 73 |
- if options.portdir_overlay is not None: |
| 74 |
- writemsg_level("emirrordist: warning: --portdir-overlay option is deprecated in favor of --repositories-configuration option\n", |
| 75 |
- level=logging.WARNING, noiselevel=-1) |
| 76 |
- |
| 77 |
if options.repositories_configuration is not None: |
| 78 |
env['PORTAGE_REPOSITORIES'] = options.repositories_configuration |
| 79 |
- elif options.portdir_overlay is not None: |
| 80 |
- env['PORTDIR_OVERLAY'] = options.portdir_overlay |
| 81 |
- |
| 82 |
- if options.portdir is not None: |
| 83 |
- env['PORTDIR'] = options.portdir |
| 84 |
|
| 85 |
settings = portage.config(config_root=config_root, |
| 86 |
local_config=False, env=env) |
Archives