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 39A731384B4 for ; Tue, 1 Dec 2015 17:56:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0D7021C031; Tue, 1 Dec 2015 17:56:46 +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 94D4221C031 for ; Tue, 1 Dec 2015 17:56:46 +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 464D7340862 for ; Tue, 1 Dec 2015 17:56:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A571A612 for ; Tue, 1 Dec 2015 17:56:41 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1448992457.528dc7cfa2856c1467759e81c99e35322fbffcce.arfrever@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/fetch.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 528dc7cfa2856c1467759e81c99e35322fbffcce X-VCS-Branch: master Date: Tue, 1 Dec 2015 17:56:41 +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: 5b858fb1-e664-49d3-90ff-68ffdeafea79 X-Archives-Hash: 64b10382b2afe110bb1daf84a55ab955 commit: 528dc7cfa2856c1467759e81c99e35322fbffcce Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Tue Dec 1 17:54:17 2015 +0000 Commit: Arfrever Frehtes Taifersar Arahesis apache org> CommitDate: Tue Dec 1 17:54:17 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=528dc7cf portage.package.ebuild.fetch.fetch(): Clean setting of variables. pym/portage/package/ebuild/fetch.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py index 7e4e6fe..1be2800 100644 --- a/pym/portage/package/ebuild/fetch.py +++ b/pym/portage/package/ebuild/fetch.py @@ -1,4 +1,4 @@ -# Copyright 2010-2014 Gentoo Foundation +# Copyright 2010-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function @@ -987,10 +987,9 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, } for k in ("DISTDIR", "PORTAGE_SSH_OPTS"): - try: - variables[k] = mysettings[k] - except KeyError: - pass + v = mysettings.get(k) + if v is not None: + variables[k] = v myfetch = shlex_split(locfetch) myfetch = [varexpand(x, mydict=variables) for x in myfetch]