addpkg, delpkg: Depend on the new repos module

bin/addpkg

@@ -3,18 +3,18 @@
 
 Functions:
 ==========
-add_pkgfiles(cachedir, pkgs)
+* add_pkgfiles(cachedir, pkgs)
-repo_add(db, pkgs, opts=None)
+* repo_add(db, pkgs, opts=None)
 """
 
 import argparse
 import logging
 import shutil
-import subprocess
 import sys
 
 import packaging_scripts.pacmanconf as pacmanconf
 import packaging_scripts.pkgfiles as pkgfiles
+import packaging_scripts.repos as repos
 
 # ========== Constants ==========
 REPO_ADD_CMD = '/usr/bin/repo-add'
@@ -53,42 +53,6 @@ def add_pkgfile(pkg, cachedir):
     shutil.move(pkg, cachedir)
 
 
-def repo_add(db, pkgs, opts=None):
-    """Run repo-add.
-
-    :param repo: the repository to remove from
-    :type repo: str
-    :param pkgs: the names of the packages to remove
-    :type pkgs: any iterable
-    :param opts: extra options to pass to repo-add
-    :type opts: list
-    :raises: subprocess.CalledProcessError if repo-add failed
-    """
-    syslog.info('Adding packages to database')
-    syslog.debug(f"Options: {opts}")
-    syslog.debug(f"Packages: {pkgs}")
-
-    cmd = [REPO_ADD_CMD]
-
-    if opts is not None:
-        cmd.extend(opts)
-
-    cmd.append(db)
-    cmd.extend(pkgs)
-    syslog.debug(f"Final repo-add command: {cmd}")
-
-    add_process = subprocess.run(cmd,
-                                 check=True,
-                                 capture_output=True,
-                                 text=True)
-
-    syslog.debug(add_process.stdout)
-    if add_process.stderr:
-        syslog.error(add_process.stderr)
-
-    syslog.info('Finished adding packages to database')
-
-
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('-s', '--sign',
@@ -123,14 +87,15 @@ if __name__ == '__main__':
 
     if pkgs:
         pkglist = pkgs
+        siglist = []
     else:
-        pkglist = pkgfiles.get_pkgfiles() +\
+        pkglist = pkgfiles.get_pkgfiles()
-                  pkgfiles.get_pkgfiles(signatures_only=True)
+        siglist = pkgfiles.get_pkgfiles(signatures_only=True)
 
     try:
-        repo_add(db, pkglist, opts)
+        repos.repo_add('add', db, *pkglist, opts=opts)
-    except subprocess.CalledProcessError as e:
+    except repos.RepoAddError as e:
         syslog.error(e)
         exit(E_REPO_ADDERR)
 
-    map(lambda pkg: add_pkgfile(pkg, cachedir), pkglist)
+    map(lambda pkg: add_pkgfile(pkg, cachedir), pkglist + siglist)

bin/delpkg

@@ -10,11 +10,11 @@ Functions:
 import argparse
 import logging
 import shutil
-import subprocess
 import sys
 
 import packaging_scripts.pacmanconf as pacmanconf
 import packaging_scripts.pkgfiles as pkgfiles
+import packaging_scripts.pkgfiles as repos
 
 # ========== Constants ==========
 REPO_REMOVE_CMD = '/usr/bin/repo-remove'
@@ -51,42 +51,6 @@ def del_pkgfile(pkg):
     syslog.info(f"Removed {pkg}")
 
 
-def repo_remove(db, pkgs, opts=None):
-    """Run repo-remove.
-
-    :param repo: the repository to remove from
-    :type repo: str
-    :param pkgs: the names of the packages to remove
-    :type pkgs: any iterable
-    :param opts: extra options to pass to repo-remove
-    :type opts: list
-    :raises: subprocess.CalledProcessError if repo-remove failed
-    """
-    syslog.info('Removing packages from database')
-    syslog.debug(f"Options: {opts}")
-    syslog.debug(f"Packages: {pkgs}")
-
-    cmd = [REPO_REMOVE_CMD]
-
-    if opts is not None:
-        cmd.extend(opts)
-
-    cmd.append(db)
-    cmd.extend(pkgs)
-    syslog.debug(f"Final repo-remove command: {cmd}")
-
-    remove_process = subprocess.run(cmd,
-                                    check=True,
-                                    capture_output=True,
-                                    text=True)
-
-    syslog.debug(remove_process.stdout)
-    if remove_process.stderr:
-        syslog.error(remove_process.stderr)
-
-    syslog.info('Finished removing packages from database')
-
-
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('-s', '--sign',
@@ -125,7 +89,7 @@ if __name__ == '__main__':
     map(lambda pkg: del_pkgfile(pkg), pkglist)
 
     try:
-        repo_remove(repo, pkglist, opts)
+        repos.repo_add('remove', db, *pkglist, opts=opts)
-    except subprocess.CalledProcessError as e:
+    except repos.RepoAddError as e:
         syslog.error(e)
         exit(E_REPO_REMOVEERR)