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 E32AD158913 for ; Mon, 15 Jan 2024 06:33:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2896AE29DC; Mon, 15 Jan 2024 06:33:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 12D6AE29DC for ; Mon, 15 Jan 2024 06:33:05 +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 3A7B934327F for ; Mon, 15 Jan 2024 06:33:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A09C8B39 for ; Mon, 15 Jan 2024 06:33:02 +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: <1705300370.1cf6d7caf82fc92aa72e4cd0d9c5815b160db5d3.arthurzam@gentoo> Subject: [gentoo-commits] proj/pkgcore/pkgcore:master commit in: src/pkgcore/pytest/ X-VCS-Repository: proj/pkgcore/pkgcore X-VCS-Files: src/pkgcore/pytest/plugin.py X-VCS-Directories: src/pkgcore/pytest/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 1cf6d7caf82fc92aa72e4cd0d9c5815b160db5d3 X-VCS-Branch: master Date: Mon, 15 Jan 2024 06:33:02 +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: 24e4f337-1528-4c59-8c27-9cbb1993a475 X-Archives-Hash: f2151a9fdcf3cb3af927e77e3b8a70df commit: 1cf6d7caf82fc92aa72e4cd0d9c5815b160db5d3 Author: Anthony Ryan gmail com> AuthorDate: Sat Jan 13 04:27:03 2024 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Mon Jan 15 06:32:50 2024 +0000 URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=1cf6d7ca Write LICENSE before SLOT in create_ebuild() Better matches the order defined in skel.ebuild A prerequisite for https://github.com/pkgcore/pkgcheck/pull/645 Signed-off-by: Anthony Ryan gmail.com> Closes: https://github.com/pkgcore/pkgcore/pull/425 Signed-off-by: Arthur Zamarin gentoo.org> src/pkgcore/pytest/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pkgcore/pytest/plugin.py b/src/pkgcore/pytest/plugin.py index 6578050e2..0579a45ad 100644 --- a/src/pkgcore/pytest/plugin.py +++ b/src/pkgcore/pytest/plugin.py @@ -263,14 +263,14 @@ class EbuildRepo: f.write(f"EAPI={eapi}\n\n") f.write(f'DESCRIPTION="{desc}"\n') f.write(f'HOMEPAGE="{homepage}"\n') - f.write(f'SLOT="{slot}"\n') - if license: f.write(f'LICENSE="{license}"\n') # create a fake license os.makedirs(pjoin(self.path, "licenses"), exist_ok=True) touch(pjoin(self.path, "licenses", license)) + f.write(f'SLOT="{slot}"\n') + for k, v in kwargs.items(): # handle sequences such as KEYWORDS and IUSE if isinstance(v, (tuple, list)):