From 89e9673132540896fe4bc1e417162f8b1df78251 Mon Sep 17 00:00:00 2001 From: Eric Torres Date: Mon, 28 Jan 2019 21:28:14 -0800 Subject: [PATCH] Code cleanup for add_pkgfiles in addpkg --- bin/addpkg | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/bin/addpkg b/bin/addpkg index b44c0b5..3b20e26 100644 --- a/bin/addpkg +++ b/bin/addpkg @@ -9,6 +9,7 @@ Functions: import argparse import logging +import shutil import subprocess import sys @@ -37,27 +38,28 @@ syslog.addHandler(stderr_handler) # ========== Functions ========== -def add_pkgfiles(cachedir, pkgs): - """ Remove package files from the repository directory. +def add_pkgfiles(cachedir, pkgs=None): + """Add package files to the repository directory. - :param cachedir: directory to operate on - :type cachedir: str, bytes, or path-like object - :param pkgs: names of packages to remove + :param pkgs: names of packages to add :type pkgs: any container object """ syslog.info(f"Adding package files to {cachedir}") syslog.debug(f"Packages: {pkgs}") - for pkg in pkgs: - for pkgfile in pkgfiles.get_pkgfiles(pkg, directory=cachedir) +\ - pkgfiles.get_pkgfiles(pkg, directory=cachedir, - signatures_only=True): - pkgfile.unlink() - syslog.info(f"Added {pkgfile}") + if pkgs is not None: + pkglist = pkgs + else: + pkglist = pkgfiles.get_pkgfiles() +\ + pkgfiles.get_pkgfiles(signatures_only=True) + + for pkg in pkglist: + shutil.move(pkg, cachedir) + syslog.info(f"Added {pkg}") def repo_add(db, pkgs, opts=None): - """ Run repo-add. + """Run repo-add. :param repo: the repository to remove from :type repo: str