synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

zap_mismatch_bins: Adjust to new apkindex parsing 

Without this fix, `pmbootstrap zap -m` fails with:

  File "/home/user/code/pmbootstrap/pmb/__init__.py", line 61, in main
    getattr(frontend, args.action)(args)
  File "/home/user/code/pmbootstrap/pmb/helpers/frontend.py", line 322, in zap
    distfiles=args.distfiles)
  File "/home/user/code/pmbootstrap/pmb/chroot/zap.py", line 54, in zap
    zap_mismatch_bins(args, confirm, dry)
  File "/home/user/code/pmbootstrap/pmb/chroot/zap.py", line 110, in zap_mismatch_bins
    if pkgname != bin_data["pkgname"]:
KeyError: 'pkgname'
This commit is contained in:
Oliver Smith 2018-02-20 21:41:03 +00:00 committed by GitHub
parent a3676b1bbc
commit 90ca7b6351
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmb/chroot/zap.py
View File

@ -103,7 +103,7 @@ def zap_mismatch_bins(args, confirm=True, dry=False):
reindex = False
for apkindex_path in glob.glob(args.work + "/packages/*/APKINDEX.tar.gz"):
apkindex = pmb.parse.apkindex.parse(args, apkindex_path)
apkindex = pmb.parse.apkindex.parse(args, apkindex_path, False)
for pkgname, bin_data in apkindex.items():
# Only real packages have apks, provided packages do not exist
# (e.g. "so:libtest.so.1.2")