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

Make use of os instead of shutil for move operations

Browse Source
This commit is contained in:
Eric Torres 2019-01-30 16:20:13 -08:00
parent 9e8b3da405
commit 9fc8eee572
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bin/addpkg
View File

@ -9,8 +9,7 @@ Functions:
import argparse import argparse
import logging import logging
import shutil import os
import sys
import packaging_scripts.pacmanconf as pacmanconf import packaging_scripts.pacmanconf as pacmanconf
import packaging_scripts.pkgfiles as pkgfiles import packaging_scripts.pkgfiles as pkgfiles
@ -19,38 +18,28 @@ import packaging_scripts.repos as repos
# ========== Constants ========== # ========== Constants ==========
REPO_ADD_CMD = '/usr/bin/repo-add' REPO_ADD_CMD = '/usr/bin/repo-add'
DB_EXT = 'db.tar.xz' DB_EXT = 'db.tar.xz'
LOGFORMAT = '==> %(levelname)s %(message)s'
# ========== Exit codes ========== # ========== Exit codes ==========
E_REPO_ADDERR = 2 E_REPO_ADDERR = 2
# ========== Logging setup ========== # ========== Logging setup ==========
console_formatter = logging.Formatter('==> %(levelname)s %(message)s') console_formatter = logging.Formatter(LOGFORMAT)
logging.basicConfig(format='==> %(levelname)s %(message)s', logging.basicConfig(format=LOGFORMAT,
level=logging.DEBUG) level=logging.DEBUG)
#stdout_handler = logging.StreamHandler(sys.stdout)
#stdout_handler.setLevel(logging.INFO)
#stdout_handler.setFormatter(console_formatter)
#
#stderr_handler = logging.StreamHandler()
#stderr_handler.setLevel(logging.ERROR)
#stderr_handler.setFormatter(console_formatter)
#
#logging.addHandler(stdout_handler)
#logging.addHandler(stderr_handler)
# ========== Functions ========== # ========== Functions ==========
def add_pkgfile(pkg, cachedir): def add_pkgfile(pkg, cachedir):
"""Add package file to the repository directory. """Add package file to the repository directory.
:param pkg: path of package to add :param pkg: path of package to add
:type pkg: str, bytes, or path-like object :type pkg: pathlib.Path object
:param cachedir: cache directory to move package to :param cachedir: cache directory to move package to
:type cachedir: str, bytes, or path-like object :type cachedir: pathlib.Path object
""" """
logging.info(f"Adding {pkg} to {cachedir}") logging.info(f"Adding {pkg} to {cachedir}")
shutil.move(str(pkg), cachedir) os.rename(pkg, cachedir.joinpath(pkg.name))
if __name__ == '__main__': if __name__ == '__main__':