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 3B2631384B4 for ; Wed, 9 Dec 2015 01:31:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F43821C00E; Wed, 9 Dec 2015 01:30:57 +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 01A3021C00E for ; Wed, 9 Dec 2015 01:30:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91727340814 for ; Wed, 9 Dec 2015 01:30:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36C739A1 for ; Wed, 9 Dec 2015 01:30:50 +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: <1449624599.d8e8accc142cce05d558d841c92e6e0249445ebf.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d8e8accc142cce05d558d841c92e6e0249445ebf X-VCS-Branch: master Date: Wed, 9 Dec 2015 01:30:50 +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: 17c7f247-0cc0-436e-89ee-6d8ea06b0d66 X-Archives-Hash: 7665c712daed8c3a06c9e6546dab482f commit: d8e8accc142cce05d558d841c92e6e0249445ebf Author: Zac Medico gentoo org> AuthorDate: Wed Dec 9 01:26:34 2015 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Dec 9 01:29:59 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d8e8accc config: fix default USE_ORDER setting This may fix the USE_ORDER KeyError that's been causing testFakedbapi to fail for travis-ci. pym/portage/package/ebuild/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index b6217e7..975fe88 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -838,7 +838,8 @@ class config(object): # reasonable defaults; this is important as without USE_ORDER, # USE will always be "" (nothing set)! if "USE_ORDER" not in self: - self.backupenv["USE_ORDER"] = "env:pkg:conf:defaults:pkginternal:repo:env.d" + self["USE_ORDER"] = "env:pkg:conf:defaults:pkginternal:repo:env.d" + self.backup_changes("USE_ORDER") if "CBUILD" not in self and "CHOST" in self: self["CBUILD"] = self["CHOST"]