From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8EDCD1382C5 for ; Wed, 24 Feb 2021 15:14:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9269CE085B; Wed, 24 Feb 2021 15:14:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E86CAE085B for ; Wed, 24 Feb 2021 15:14:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E9AE340BDE for ; Wed, 24 Feb 2021 15:14:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6829153 for ; Wed, 24 Feb 2021 15:14:05 +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: <1614179560.3e5ef19d5d6b26fde08da463d730ff90edf6eb29.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/fetch.py X-VCS-Directories: lib/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3e5ef19d5d6b26fde08da463d730ff90edf6eb29 X-VCS-Branch: master Date: Wed, 24 Feb 2021 15:14:05 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b2afcfab-03cc-4a69-9bd2-e8f0a71cb29f X-Archives-Hash: 7326a1db4608185a703637369033053e commit: 3e5ef19d5d6b26fde08da463d730ff90edf6eb29 Author: Zac Medico gentoo org> AuthorDate: Wed Feb 24 15:08:30 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Feb 24 15:12:40 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3e5ef19d fetch.py: fix UnboundLocalError: local variable 'myfile' Reported-by: Ionen Wolkens gmail.com> Bug: https://bugs.gentoo.org/772386 Fixes: b9ef191c7498 ("MirrorLayoutConfig: content digest support (bug 756778)") Signed-off-by: Zac Medico gentoo.org> lib/portage/package/ebuild/fetch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/portage/package/ebuild/fetch.py b/lib/portage/package/ebuild/fetch.py index f0ae864ad..d23bbfecb 100644 --- a/lib/portage/package/ebuild/fetch.py +++ b/lib/portage/package/ebuild/fetch.py @@ -898,11 +898,11 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, for myuri in myuris: if urlparse(myuri).scheme: file_uri_tuples.append( - (DistfileName(myfile, digests=mydigests.get(myfile)), myuri) + (DistfileName(myfile, digests=mydigests.get(os.path.basename(myuri))), myuri) ) else: file_uri_tuples.append( - (DistfileName(myfile, digests=mydigests.get(myfile)), None) + (DistfileName(myfile, digests=mydigests.get(os.path.basename(myuri))), None) ) filedict = OrderedDict()