etorres/packaging-scripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

General code cleanup

Browse Source
This commit is contained in:
Eric Torres 2019-02-22 07:34:51 -08:00
parent 41586d3de1
commit c69ed345f3
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/addpkg
View File

@ -18,7 +18,6 @@ import packaging_scripts.pkgfiles as pkgfiles
import packaging_scripts.repos as repos import packaging_scripts.repos as repos
# ========== Constants ========== # ========== Constants ==========
REPO_ADD_CMD = '/usr/bin/repo-add'
DB_EXT = 'db.tar.xz' DB_EXT = 'db.tar.xz'
LOGFORMAT = '==> %(levelname)s %(message)s' LOGFORMAT = '==> %(levelname)s %(message)s'
@ -81,10 +80,10 @@ if __name__ == '__main__':
pkgs = args.packages pkgs = args.packages
opts = args.opts opts = args.opts
cachedir = f"/var/cache/pacman/{repo}" cachedir = os.path.join('/var', 'cache', 'pacman', repo)
# this assumes that the db file for the repo # this assumes that the db file for the repo
# has the same name as that repo # has the same name as that repo
db = f"{cachedir}/{repo}.{DB_EXT}" db = os.path.join(cachedir, f"repo.{DB_EXT}")
if args.verbose: if args.verbose:
stdout_handler.setLevel(logging.DEBUG) stdout_handler.setLevel(logging.DEBUG)
@ -93,8 +92,8 @@ if __name__ == '__main__':
pkg_tarballs = pkgs pkg_tarballs = pkgs
sigfiles = [] sigfiles = []
else: else:
pkg_tarballs = list(pkgfiles.get_pkgfiles()) pkg_tarballs = pkgfiles.get_pkgfiles()
sigfiles = list(pkgfiles.get_pkgfiles(signatures_only=True)) sigfiles = pkgfiles.get_pkgfiles(signatures_only=True)
if not pkg_tarballs: if not pkg_tarballs:
syslog.critical('No package tarballs have been found, exiting') syslog.critical('No package tarballs have been found, exiting')

5
bin/delpkg
View File

@ -17,7 +17,6 @@ import packaging_scripts.pkgfiles as pkgfiles
import packaging_scripts.repos as repos import packaging_scripts.repos as repos
# ========== Constants ========== # ========== Constants ==========
REPO_REMOVE_CMD = '/usr/bin/repo-remove'
DB_EXT = 'db.tar.xz' DB_EXT = 'db.tar.xz'
# ========== Exit codes ========== # ========== Exit codes ==========
@ -75,10 +74,10 @@ if __name__ == '__main__':
pkgs = args.packages pkgs = args.packages
opts = args.opts opts = args.opts
cachedir = f"/var/cache/pacman/{repo}" cachedir = os.path.join('/var', 'cache', 'pacman', repo)
# this assumes that the db file for the repo # this assumes that the db file for the repo
# has the same name as that repo # has the same name as that repo
db = f"{cachedir}/{repo}.{DB_EXT}" db = os.path.join(cachedir, f"repo.{DB_EXT}")
if args.verbose: if args.verbose:
stdout_handler.setLevel(logging.DEBUG) stdout_handler.setLevel(logging.DEBUG)