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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2E708158020 for ; Thu, 22 Dec 2022 07:12:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C8BCE07E1; Thu, 22 Dec 2022 07:11:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9D05E07E1 for ; Thu, 22 Dec 2022 07:11:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D0C393412C6 for ; Thu, 22 Dec 2022 07:11:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29CDC7DE for ; Thu, 22 Dec 2022 07:11:55 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1671677598.1ede34f996036605b6623dc0525df26826ac405d.arthurzam@gentoo> Subject: [gentoo-commits] proj/pkgcore/pkgcore:master commit in: src/pkgcore/ebuild/ X-VCS-Repository: proj/pkgcore/pkgcore X-VCS-Files: src/pkgcore/ebuild/ebd_ipc.py X-VCS-Directories: src/pkgcore/ebuild/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 1ede34f996036605b6623dc0525df26826ac405d X-VCS-Branch: master Date: Thu, 22 Dec 2022 07:11:55 +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: df2b686d-89f6-4ab4-8e10-000ac4cafa60 X-Archives-Hash: 311bd3cbe7c325b28a730c514d246a15 commit: 1ede34f996036605b6623dc0525df26826ac405d Author: Brian Harring gmail com> AuthorDate: Tue Sep 21 23:51:32 2021 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Thu Dec 22 02:53:18 2022 +0000 URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=1ede34f9 ebd_ipc: filter unpack results when needed. The previous form was risky in that it assigned a generator to consume from; this form of pattern can bite folks in the ass; minimally, it makes tests trickier. Signed-off-by: Brian Harring gmail.com> src/pkgcore/ebuild/ebd_ipc.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pkgcore/ebuild/ebd_ipc.py b/src/pkgcore/ebuild/ebd_ipc.py index e7947837f..403bb352a 100644 --- a/src/pkgcore/ebuild/ebd_ipc.py +++ b/src/pkgcore/ebuild/ebd_ipc.py @@ -1039,7 +1039,6 @@ class Unpack(IpcCommand): def parse_args(self, *args, **kwargs): args = super().parse_args(*args, **kwargs) self.opts.distdir = self.op.env['DISTDIR'] - args.targets = self._filter_targets(args.targets) return args def _filter_targets(self, targets): @@ -1090,7 +1089,7 @@ class Unpack(IpcCommand): spawn_kwargs['uid'] = os_data.portage_uid spawn_kwargs['gid'] = os_data.portage_gid - for filename, ext, source in args.targets: + for filename, ext, source in self._filter_targets(args.targets): self.observer.write(f'>>> Unpacking {filename} to {self.cwd}', autoline=True) self.observer.flush() dest = pjoin(self.cwd, os.path.basename(filename[:-len(ext)]))