diff options
| author |   Markus Walter <houseofsuns@houseofsuns.org> | 2023-02-18 21:14:26 +0100 |
|---|---|---|
| committer |   Ulrich Müller <ulm@gentoo.org> | 2023-02-19 15:46:56 +0100 |
| commit | a0924d50b6346fe86c7f0db34a92eb9760d1b17a (patch) | |
| tree | 22f301a350c5ca5435b869097a08714d511a9ead | |
| parent | Revert "gs_elpa/ebuild.py: Generate ebuilds for EAPI 7" (diff) | |
| download | gs-elpa-a0924d50b6346fe86c7f0db34a92eb9760d1b17a.tar.gz gs-elpa-a0924d50b6346fe86c7f0db34a92eb9760d1b17a.tar.bz2 gs-elpa-a0924d50b6346fe86c7f0db34a92eb9760d1b17a.zip | |
Adjust to sexpdata version 0.0.4.
https://bugs.gentoo.org/895314
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
| -rwxr-xr-x[-rw-r--r--] | gs_elpa/elpa_db.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gs_elpa/elpa_db.py b/gs_elpa/elpa_db.py index d9cac6c..c189712 100644..100755 --- 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) |