Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 2 additions & 13 deletions omv/common/inout.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,29 +120,18 @@ def check_output(cmds, cwd=".", shell=False, verbosity=0, env=None):
return ret_string

except sp.CalledProcessError as err:
inform(
"CalledProcessError running commands: %s in %s (return code: %s), output:\n%s"
% (cmds, cwd, err.returncode, err.output),
indent=2,
verbosity=verbosity,
)
inform("Error: %s" % (err), indent=2, verbosity=verbosity)
raise err
except Exception as err:
inform(
"Error running commands: %s in (%s)!" % (cmds, cwd),
indent=2,
verbosity=verbosity,
)
inform("Error: %s" % (err), indent=2, verbosity=verbosity)
raise err


def pip_install(packages, version=None):
pip = "pip3" if sys.version_info.major == 3 else "pip"
cmds = [pip, "install"]
if type(packages) == str:
if version == None:
if isinstance(packages, str):
if version is None:
cmds.append(packages)
else:
cmds.append("%s==%s" % (packages, version))
Expand Down