spacefreak/pyquarantine-milter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix installation

Browse Source
This commit is contained in:
Thomas Oettli
2022-01-11 21:16:34 +01:00
parent 571ef52a5e
commit e59aa11eca
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pyquarantine/_install.py
View File

@@ -144,10 +144,10 @@ def install(name):
if _check_openrc(): if _check_openrc():
_install_files(_openrc_files(pkg_dir, name)) _install_files(_openrc_files(pkg_dir, name))
if not _create_dir(f"/etc/{name}"): for d in [f"/etc/{name}", f"/etc/{name}/templates"]:
if not _create_dir(d):
logging.error(" => unable to create config dir, giving up ...") logging.error(" => unable to create config dir, giving up ...")
sys.exit(3) sys.exit(3)
_install_files(_config_files(pkg_dir, name)) _install_files(_config_files(pkg_dir, name))
logging.info(f"{name} successfully installed") logging.info(f"{name} successfully installed")
@@ -163,6 +163,7 @@ def uninstall(name):
_uninstall_files(_openrc_files(pkg_dir, name)) _uninstall_files(_openrc_files(pkg_dir, name))
_uninstall_files(_config_files(pkg_dir, name)) _uninstall_files(_config_files(pkg_dir, name))
_delete_dir(f"/etc/{name}/templates")
_delete_dir(f"/etc/{name}") _delete_dir(f"/etc/{name}")
logging.info(f"{name} successfully uninstalled") logging.info(f"{name} successfully uninstalled")

14
pyquarantine/run.py
View File

@@ -74,13 +74,6 @@ def main():
args = parser.parse_args() args = parser.parse_args()
name = "pyquarantine"
if args.install:
sys.exit(install(name))
if args.uninstall:
sys.exit(uninstall(name))
root_logger = logging.getLogger() root_logger = logging.getLogger()
root_logger.setLevel(logging.DEBUG) root_logger.setLevel(logging.DEBUG)
@@ -95,6 +88,13 @@ def main():
if not args.debug: if not args.debug:
logger.setLevel(logging.INFO) logger.setLevel(logging.INFO)
name = "pyquarantine"
if args.install:
sys.exit(install(name))
if args.uninstall:
sys.exit(uninstall(name))
try: try:
logger.debug("read milter configuration") logger.debug("read milter configuration")
cfg = get_milter_config(args.config) cfg = get_milter_config(args.config)