From 9074565f4e623124f17ce02657e35d658abafae5 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Tue, 25 Sep 2018 10:09:16 -0700 Subject: Implement pod varlink bindings * Update varlink document * Add NoContainersInPod error in go and python * Add support for varlink pod interface * New code passes pylint * Fix bug in test_runner.sh * Update integration tests for race condition on status check * Add missing port config file support Signed-off-by: Jhon Honce --- contrib/python/pypodman/pypodman/lib/podman_parser.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'contrib/python/pypodman') diff --git a/contrib/python/pypodman/pypodman/lib/podman_parser.py b/contrib/python/pypodman/pypodman/lib/podman_parser.py index 4150e5d50..a7c869a98 100644 --- a/contrib/python/pypodman/pypodman/lib/podman_parser.py +++ b/contrib/python/pypodman/pypodman/lib/podman_parser.py @@ -69,8 +69,8 @@ class PodmanArgumentParser(argparse.ArgumentParser): self.add_argument( '--username', '-l', - default=getpass.getuser(), - help='Authenicating user on remote host. (default: %(default)s)') + help='Authenicating user on remote host. (default: {})'.format( + getpass.getuser())) self.add_argument( '--host', help='name of remote host. (default: None)') self.add_argument( @@ -174,6 +174,13 @@ class PodmanArgumentParser(argparse.ArgumentParser): or getpass.getuser() ) # yapf:disable + reqattr( + 'port', + getattr(args, 'port') + or os.environ.get('PORT') + or config['default'].get('port', None) + ) # yapf:disable + reqattr( 'remote_socket_path', getattr(args, 'remote_socket_path') -- cgit v1.2.3-54-g00ecf