Reimplement repo_add as db_modify and clean code accordingly
This commit is contained in:
@ -104,13 +104,10 @@ if __name__ == '__main__':
|
||||
exit(E_NOFILESERR)
|
||||
|
||||
try:
|
||||
repos.repo_add('add', db, *pkg_tarballs, opts=opts)
|
||||
repos.db_modify('add', db, *opts, *pkg_tarballs)
|
||||
except repos.RepoAddError as e:
|
||||
syslog.error(e)
|
||||
exit(E_REPO_ADDERR)
|
||||
|
||||
for pkg_tarball in pkg_tarballs:
|
||||
add_pkgfile(pkg_tarball, cachedir)
|
||||
|
||||
for sigfile in sigfiles:
|
||||
add_pkgfile(sigfile, cachedir)
|
||||
for pkgfile in (*pkg_tarballs, *sigfiles):
|
||||
add_pkgfile(pkgfile, cachedir)
|
||||
|
15
bin/delpkg
15
bin/delpkg
@ -89,13 +89,10 @@ if __name__ == '__main__':
|
||||
directory=cachedir,
|
||||
signatures_only=True)
|
||||
|
||||
for pkg_tarball in pkg_tarballs:
|
||||
del_pkgfile(pkg_tarball)
|
||||
for pkgfile in (*pkg_tarballs, *sigfiles):
|
||||
del_pkgfile(pkgfile)
|
||||
|
||||
for sigfile in sigfiles:
|
||||
del_pkgfile(sigfile)
|
||||
|
||||
try:
|
||||
repos.repo_add('remove', db, pkg, opts=opts)
|
||||
except repos.RepoAddError as e:
|
||||
syslog.error(e)
|
||||
try:
|
||||
repos.db_modify('remove', db, *opts, *pkgs)
|
||||
except repos.RepoAddError as e:
|
||||
syslog.error(e)
|
||||
|
Reference in New Issue
Block a user