Skip to content

Cleanup jail_exec and jail_pkg #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vbotka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Cleanup jail_exec and jail_pkg #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions iocage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,11 +447,9 @@ def jail_stop(module, iocage_path, name):

def jail_exec(module, iocage_path, name, user="root", _cmd='/usr/bin/true'):

rc = 1
_changed = True
out = ""
err = ""
_msg = ""
_changed = True
if not module.check_mode:
cmd = f"{iocage_path} exec -u {user} {name} -- {_cmd}"
rc, out, err = module.run_command(to_bytes(cmd, errors='surrogate_or_strict'),
Expand All @@ -460,7 +458,7 @@ def jail_exec(module, iocage_path, name, user="root", _cmd='/usr/bin/true'):
_command_fail(module,
f"Command '{_cmd}' could not be executed in jail '{name}'.",
cmd, rc, out, err)
_msg = (f"Command '{cmd}' was executed in jail '{name}'.\nrc: {rc}\nstdout:\n{out}\nstderr:\n{err}")
_msg = f"Command '{cmd}' was executed in jail '{name}'.\nrc: {rc}\nstdout:\n{out}\nstderr:\n{err}"
else:
_msg = f"Command '{_cmd}' would have been executed in jail '{name}'."

Expand All @@ -469,11 +467,9 @@ def jail_exec(module, iocage_path, name, user="root", _cmd='/usr/bin/true'):

def jail_pkg(module, iocage_path, name, _cmd='info'):

rc = 1
_changed = True
out = ""
err = ""
_msg = ""
_changed = True
if not module.check_mode:
cmd = f"{iocage_path} pkg {name} {_cmd}"
rc, out, err = module.run_command(to_bytes(cmd, errors='surrogate_or_strict'),
Expand All @@ -482,7 +478,7 @@ def jail_pkg(module, iocage_path, name, _cmd='info'):
_command_fail(module,
f"pkg '{_cmd}' could not be executed in jail '{name}'.",
cmd, rc, out, err)
_msg = (f"pkg '{_cmd}' was executed in jail '{name}'.\nstdout:\n{out}\nstderr:\n{err}")
_msg = f"pkg '{_cmd}' was executed in jail '{name}'.\nstdout:\n{out}\nstderr:\n{err}"

else:
_msg = f"pkg '{_cmd}' would have been executed in jail '{name}'."
Expand Down