commit: a0924d50b6346fe86c7f0db34a92eb9760d1b17a Author: Markus Walter <houseofsuns <AT> houseofsuns <DOT> org> AuthorDate: Sat Feb 18 20:14:26 2023 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Feb 19 14:46:56 2023 +0000 URL: https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=a0924d50
Adjust to sexpdata version 0.0.4. https://bugs.gentoo.org/895314 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> gs_elpa/elpa_db.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gs_elpa/elpa_db.py b/gs_elpa/elpa_db.py old mode 100644 new mode 100755 index d9cac6c..c189712 --- a/gs_elpa/elpa_db.py +++ b/gs_elpa/elpa_db.py @@ -7,7 +7,7 @@ ELPA package database - :copyright: (c) 2013-2021 Jauhien Piatlicki and others + :copyright: (c) 2013-2023 Jauhien Piatlicki and others :license: GPL-2, see LICENSE for more details. """ @@ -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].value() - realname = entry[PKG_NAME].value() + desc = entry[PKG_INFO].I + realname = str(entry[PKG_NAME]) 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 = desc[INFO_SRC_TYPE].value() + source_type = str(desc[INFO_SRC_TYPE]) allowed_ords = set(range(ord('a'), ord('z'))) \ | set(range(ord('A'), ord('Z'))) | \ @@ -112,8 +112,9 @@ class ElpaDBGenerator(DBGenerator): dependencies = serializable_elist(separator="\n\t") for dep in deps: - dep = self.convert_dependency([common_config, config], - dep[DEP_NAME].value(), external = False) + dep = self.convert_dependency( + [common_config, config], str(dep[DEP_NAME]), + external=False) if dep: dependencies.append(dep)
