commit: 5b9e13c7e0e1a45ede9f95a0cf7301b2d474d170 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sat May 20 09:34:34 2023 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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)
