opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1886 from edsantiago/pypod_run_args

Browse Source 
pypod run: ignore args intended for container command
This commit is contained in:
OpenShift Merge Robot
2018-11-30 11:09:56 -08:00
committed by GitHub
parent b504623a11 3d0cdd898c
commit 5b738ea7ff
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/python/pypodman/pypodman/lib/actions/create_action.py
View File

@ -21,7 +21,7 @@ class Create(AbstractActionBase):
parser.add_argument('image', nargs=1, help='source image id') parser.add_argument('image', nargs=1, help='source image id')
parser.add_argument( parser.add_argument(
'command', 'command',
nargs='*', nargs=parent.REMAINDER,
help='command and args to run.', help='command and args to run.',
) )
parser.set_defaults(class_=cls, method='create') parser.set_defaults(class_=cls, method='create')

2
contrib/python/pypodman/pypodman/lib/actions/run_action.py
View File

@ -21,7 +21,7 @@ class Run(AbstractActionBase):
parser.add_argument('image', nargs=1, help='source image id.') parser.add_argument('image', nargs=1, help='source image id.')
parser.add_argument( parser.add_argument(
'command', 'command',
nargs='*', nargs=parent.REMAINDER,
help='command and args to run.', help='command and args to run.',
) )
parser.set_defaults(class_=cls, method='run') parser.set_defaults(class_=cls, method='run')

2
contrib/python/pypodman/pypodman/lib/podman_parser.py
View File

@ -97,6 +97,8 @@ class PodmanArgumentParser(argparse.ArgumentParser):
actions_parser = self.add_subparsers( actions_parser = self.add_subparsers(
dest='subparser_name', help='commands') dest='subparser_name', help='commands')
# For create/exec/run: don't process options intended for subcommand
actions_parser.REMAINDER = argparse.REMAINDER
# import buried here to prevent import loops # import buried here to prevent import loops
import pypodman.lib.actions # pylint: disable=cyclic-import import pypodman.lib.actions # pylint: disable=cyclic-import