| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
| 9b6ec109a1 |
cmds and lib: Don't print() log messages
print() should be used to output information requested by a certain command, but not for logging the process to achieve it. log() should be used for the latter. The current code has the distinction not down clearly, fix that. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 6d876e88f6 |
lib.util.run_sudo(): Pass argument list on unchanged
run_sudo() is a thin wrapper around ExecContext.sudo(), so don't try to make sense more arguments than necessary. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 21e67291b5 |
Fix: Decode run_cmd() result
Since commit Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 02697af568 |
lib.ExecContext: Align .sudo() prototype to .run()
ExecContext's .sudo() omits many of run()'s parameters, and this commit adds them. To avoid redundancy around repeating and massaging the long parameter list of both functions and their return values, it also adds some deeper changes: - Make run(), _run(), sudo() and _sudo() always return instances of
Result. Before it was allowed to return a triplet of stdout,
stderr, and exit status. - Have ExecContext stay out of the business of decoding the result
entirely. Result provides a convenience method .decode()
operating on stdout and stderr and leaves the decision to the
caller. This entails miniscule adaptations in calling code, namely in
App.os_release, util.get_profile_env() and CmdListRepos._run(). - Wrap the _run() and _sudo() callbacks in a context manager object
of type CallContext to avoid code duplication. - Consistently name the first argument to run(), _run(), sudo() and
_sudo() "cmd", not "args". The latter suggests that the caller is
omitting the executable, which is not the case. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 67a2931f5e |
App: Support --verbose
Add the --verbose global option, which is made available as the App.verbose property. Some functions still take a verbose parameter, but the type of these parameters is converted from bool to bool|None. The idea is that, if they are None, their verbosity falls back to the global default. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 7fdba1b5db |
lib.util: Add ec: ExecContext to all subprocesses
Allow to pass an optional execution context to all functions spawning a subprocess defined in lib.util. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| fadf1bca49 |
lib.util.run_cmd(): Add parameter ec: ExecContext
Allow to specify the ExecContext in a call to run_cmd(). This effectively makes run_cmd() an thin wrapper around ExecContext.run(), which is what's going to be used in the future. The wrapper is for backwards-compatibility. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 3e897f4df8 |
lib.Distro, ExecContext: Add classes, refactor lib.distro
The code below lib.distro, as left behind by the previous commit, is geared towards being directly used as a command-line API. This commit introduces the abstract base class Distro, a proxy for distribution-specific interactions. The proxy abstracts distro specifics into an API with proper method prototypes, not argparse.Namespace contents, and can thus be more easily driven by arbitrary code. The Distro class is initialized with a member variable of type ExecContext, another new class introduced by this commit. It is designed to abstract the communication channel to the distribution instance. Currently only one specialization exists, Local, which interacts with the distribution and root file system it is running in, but is planned to be subclassed to support interaction via SSH, serial, chroot, or chains thereof. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| ae902250bd |
jw/pkg/lib/util.run_cmd(): Chunked read_stream()
jw-pkg distro dup got hung in a chroot environment. strace shows that write(2) into a pipe is the hanging syscall, with the write buffer hinting at zypper dup output. I strongly suspect that run_cmd() tries to write stdout into the pipe which read_stream() fails to empty. So, make read_stream() more resilient by using read(4096) instead of readline(), which I suspect to be prone to hang on overlong lines. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 0c1c2b9351 |
lib.util.run_cmd(): Reduce interactive logging
run_cmd() with cmd_input == mode:interactive and verbose == true logs output too often. First, __log() is called, then pty.spawn() writes everything it reads from the PTY master to the terminal. The fix it to not call __log() from _read() for the PTY reader. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 8bc22a3a68 |
lib.util.run_cmd(): Fix docstring
The docstring of run_cmd()'s signature documents a wrong return value, fix that. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 565946643b |
jw.pkg.*.run_xxx(): Return exit status
Most run_xxx() return stdout and stderr. There's no way, really, for the caller to get hold of the exit code of the spawned executable. It can pass throw=true, catch, and assume a non-zero exit status. But that's not semantically clean, since the spawned function can well be a test function which is expected to return a non-zero status code, and the caller might be interested in what code that was, exactly. The clearest way to solve this is to return the exit code as well. This commit does that. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| afc77ab61d |
jw.pkg.lib.util.run_curl(): Beautify logging
Make some incomprensible parser error messages if run_curl() returns nothing slightly less incomprehensible. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| b81406e11a |
run_cmd() and friends: Make args a list[str]
This is a code maintenance commit: some run_xxx() helper functions take a string, some a list, and some just digest all arguments and pass them on as a list to exec() to be executed. That's highly inconsistent. This commit changes that to list-only. Except for the run_cmd() method of SSHClient, which is still run as a shell method, because, erm, it's a shell. Might be changed in the future for consistency reasons. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 2906c697de |
jw.pkg.lib.util.run_cmd(): Add stderr to exception
If an error happens, append stderr to the exception thrown. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 6916d7edc8 |
jw.pkg.lib.util.run_sudo(): Add parameter verbose
Add parameter verbose to run_sudo() and pass it on to run_cmd(). Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| b3fd624a3f |
jw.pkg.lib.util.get_profile_env(): add -> keep
Replace the boolean parameter "add" with the richer "keep": - False -> Don't keep anything - True -> Keep what's in the current environment - List of strings -> Keep those variables Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 2d1beeebb0 |
jw.pkg.lib.util.get_profile_env(): Add function
Add a function get_profile_env(), a function returning environment variables from /etc/profile. Pass add=True to add its contents to the existing environment dictionary, overwriting old entries, or pass False to get the pristine content. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| e104fa2e46 |
jw.pkg.lib.util.run_cmd(): Add output_encoding
Add a parameter "output_encoding" to run_cmd(). The parameter allows the caller to specify if the output encoding should be detected as is by passing None (the default), if the output should be returned as undecoded bytes by passing the special string "bytes", or if the output should be treated as the encoding with the specified name and decoded to strings. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 82c6a44ad6 |
jw.pkg.lib.util.run_cmd(): Fix mode:auto
In cmd_input == "mode:auto", the interactive variable is currently not set due to a typo. Fix that. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| f8dc8ee6d1 |
jw.pkg.lib.util.run_cmd(): Honour env in PTY mode
The evironment passed to run_cmd() via env is currently not honoured with mode:interactive. Fix that. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 75faf02232 |
jw.pkg.lib.util.run_cmd(): Add title parameter
Allow the caller to choose which title should be used for the command's logging output box. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 7eb15f2477 |
jw.pkg.lib: Don't log {e}
Don't log an Exception as {e} but as str(e) producing nicer output. Or as repr(e) if a backtrace is requested, because to people who can read backtraces, type info might be of interest. Also, remove pointless time stamps, those belong into the logging framework. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| b1d4e20295 |
jw.pkg.util: Add sudo()
Move the body of BackendCmd.sudo() into a function. The rationale behind that is that its functionality is independent of the calling object for the most part, so having it in a function instead of a method is the more modular pattern. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 4274a71c62 |
lib.util.run_cmd(): Rewrite it to be async
run_cmd() is synchronous. Now that all commands are asynchronous, we can await it, so rewrite it to be asynchronous, too. Other changes: - Make it return stderr as well in case its needed - Drop into a pseuto-tty if
- cmd_input == "mode:interactive" or
- cmd_input == "mode:auto" and stdin is a TTY - Add argument env, defaulting to None. If it's a dict, it will be
the environment the command is run in This entails making all functions using run_cmd() async, too, including run_curl(), get_username() and get_password(). Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 2e69639362 |
jw.pkg.build.lib: Move to jw.pkg.lib
In preparation of reorganizing the tree below cmds, move the lib subdirectory a level up. Signed-off-by: Jan Lindemann <jan@janware.com> |
