commit: 51a3ce033cc7c5d36bbfbff2379c631077976bed
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 22 12:30:19 2014 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Oct 22 13:33:16 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=51a3ce03
SyncRepos: parse EMERGE_DEFAULT_OPTS
We need to parse EMERGE_DEFAULT_OPTS, for settings like
--package-moves=n.
---
pym/portage/emaint/modules/sync/sync.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pym/portage/emaint/modules/sync/sync.py
b/pym/portage/emaint/modules/sync/sync.py
index 1bec1b1..390a168 100644
--- a/pym/portage/emaint/modules/sync/sync.py
+++ b/pym/portage/emaint/modules/sync/sync.py
@@ -58,6 +58,13 @@ class SyncRepos(object):
emerge_config = load_emerge_config(
action='sync', args=_files, opts=opts)
+ # Parse EMERGE_DEFAULT_OPTS, for settings like
+ # --package-moves=n.
+ cmdline = portage.util.shlex_split(
+ emerge_config.target_config.settings.get(
+ "EMERGE_DEFAULT_OPTS", ""))
+ emerge_config.opts = parse_opts(cmdline, silent=True)[1]
+
if hasattr(portage, 'settings'):
# cleanly destroy global objects
portage._reset_legacy_globals()
