From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 049AD138824 for ; Wed, 22 Oct 2014 13:36:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DFD8E084D; Wed, 22 Oct 2014 13:36:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D1FAE084D for ; Wed, 22 Oct 2014 13:36:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 54A5E340413 for ; Wed, 22 Oct 2014 13:36:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0076B8789 for ; Wed, 22 Oct 2014 13:36:46 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1413984796.51a3ce033cc7c5d36bbfbff2379c631077976bed.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:plugin-sync commit in: pym/portage/emaint/modules/sync/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/emaint/modules/sync/sync.py X-VCS-Directories: pym/portage/emaint/modules/sync/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 51a3ce033cc7c5d36bbfbff2379c631077976bed X-VCS-Branch: plugin-sync Date: Wed, 22 Oct 2014 13:36:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0700d306-a88f-46d3-bae8-14d23f6ada3c X-Archives-Hash: 563e9b3fb3d51b14a15745f8e95fd71a commit: 51a3ce033cc7c5d36bbfbff2379c631077976bed Author: Zac Medico gentoo org> AuthorDate: Wed Oct 22 12:30:19 2014 +0000 Commit: Zac Medico gentoo 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()