| 1 |
commit: 728087c4a9110d432f05fb685aa639529d8af69a |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 22 12:30:19 2014 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 1 21:49:42 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=728087c4 |
| 7 |
|
| 8 |
SyncRepos: parse EMERGE_DEFAULT_OPTS |
| 9 |
|
| 10 |
We need to parse EMERGE_DEFAULT_OPTS, for settings like |
| 11 |
--package-moves=n. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/portage/emaint/modules/sync/sync.py | 7 +++++++ |
| 15 |
1 file changed, 7 insertions(+) |
| 16 |
|
| 17 |
diff --git a/pym/portage/emaint/modules/sync/sync.py b/pym/portage/emaint/modules/sync/sync.py |
| 18 |
index 1bec1b1..390a168 100644 |
| 19 |
--- a/pym/portage/emaint/modules/sync/sync.py |
| 20 |
+++ b/pym/portage/emaint/modules/sync/sync.py |
| 21 |
@@ -58,6 +58,13 @@ class SyncRepos(object): |
| 22 |
emerge_config = load_emerge_config( |
| 23 |
action='sync', args=_files, opts=opts) |
| 24 |
|
| 25 |
+ # Parse EMERGE_DEFAULT_OPTS, for settings like |
| 26 |
+ # --package-moves=n. |
| 27 |
+ cmdline = portage.util.shlex_split( |
| 28 |
+ emerge_config.target_config.settings.get( |
| 29 |
+ "EMERGE_DEFAULT_OPTS", "")) |
| 30 |
+ emerge_config.opts = parse_opts(cmdline, silent=True)[1] |
| 31 |
+ |
| 32 |
if hasattr(portage, 'settings'): |
| 33 |
# cleanly destroy global objects |
| 34 |
portage._reset_legacy_globals() |
Archives