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 945BD15806E for ; Sat, 20 May 2023 09:35:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF3BEE086C; Sat, 20 May 2023 09:35:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 AA58AE086C for ; Sat, 20 May 2023 09:35:33 +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 CE1B233BE58 for ; Sat, 20 May 2023 09:35:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B5D2A68 for ; Sat, 20 May 2023 09:35:31 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1684575274.5b9e13c7e0e1a45ede9f95a0cf7301b2d474d170.ulm@gentoo> Subject: [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/ X-VCS-Repository: proj/gs-elpa X-VCS-Files: gs_elpa/elpa_db.py X-VCS-Directories: gs_elpa/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 5b9e13c7e0e1a45ede9f95a0cf7301b2d474d170 X-VCS-Branch: master Date: Sat, 20 May 2023 09:35:31 +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: 215d234e-264f-460b-ba1f-739ba89ab00e X-Archives-Hash: abc71740c5a96873cf652be82998924a commit: 5b9e13c7e0e1a45ede9f95a0cf7301b2d474d170 Author: Ulrich Müller gentoo org> AuthorDate: Sat May 20 09:34:34 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat May 20 09:34:34 2023 +0000 URL: https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=5b9e13c7 elpa_db.py: Drop the workaround for sexpdata-0.0.4 The value field was added back in sexpdata-1.0.0: https://github.com/jd-boyd/sexpdata/commit/861cc5c8c96724b3e34ee1b6e15997b1d136635d This partially reverts commit a0924d50b6346fe86c7f0db34a92eb9760d1b17a. Signed-off-by: Ulrich Müller gentoo.org> gs_elpa/elpa_db.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gs_elpa/elpa_db.py b/gs_elpa/elpa_db.py old mode 100755 new mode 100644 index c189712..2032603 --- a/gs_elpa/elpa_db.py +++ b/gs_elpa/elpa_db.py @@ -82,8 +82,8 @@ class ElpaDBGenerator(DBGenerator): #DEP_VERSION = 1 #we do not use it at the moment for entry in sexpdata.cdr(archive_contents): - desc = entry[PKG_INFO].I - realname = str(entry[PKG_NAME]) + desc = entry[PKG_INFO].value() + realname = entry[PKG_NAME].value() if self.in_config([common_config, config], "exclude", realname): continue @@ -95,7 +95,7 @@ class ElpaDBGenerator(DBGenerator): pkg = Package("app-emacs", realname, '.'.join(map(str, desc[INFO_VERSION]))) - source_type = str(desc[INFO_SRC_TYPE]) + source_type = desc[INFO_SRC_TYPE].value() allowed_ords = set(range(ord('a'), ord('z'))) \ | set(range(ord('A'), ord('Z'))) | \ @@ -112,9 +112,8 @@ class ElpaDBGenerator(DBGenerator): dependencies = serializable_elist(separator="\n\t") for dep in deps: - dep = self.convert_dependency( - [common_config, config], str(dep[DEP_NAME]), - external=False) + dep = self.convert_dependency([common_config, config], + dep[DEP_NAME].value(), external = False) if dep: dependencies.append(dep)