Differential D251

Adjust the CLI's argparsing
ClosedPublic
Actions

Authored by jskladan on Oct 15 2014, 12:50 PM.

Details

Reviewers
kparal
tflink
Commits
rDEPCKcc7f69072bb0: Adjust the CLI's argparsing
Summary

The nargs=+ for the -r option was greedy, and did not let any data
into the rpms. It had to be devided by the -- operator.

This patch modifies the behaviour, so you need to use multiple -r
options instead of one -r option with multiple values, as this makes
more sense.

There are also minor changes in the help strings.

Test Plan

./run_depcheck.py -r /tmp/depcheck_scenarios1pDScq/repo_current/ /tmp/depcheck_scenarios1pDScq/repo_updates/bar-0.1-1.fc19.noarch.rpm

Diff Detail

Repository
rDEPCK task-depcheck
Lint
Lint Skipped
Unit
Unit Tests Skipped
jskladan retitled this revision from to Adjust the CLI's argparsing.Oct 15 2014, 12:50 PM
jskladan updated this object.
jskladan edited the test plan for this revision. (Show Details)
jskladan added reviewers: tflink, kparal.
This revision is now accepted and ready to land.Oct 15 2014, 12:56 PM
jskladan closed this revision.Oct 16 2014, 7:16 AM
jskladan updated this revision to Diff 707.

Closed by commit rDEPCKcc7f69072bb0 (authored by @jskladan).

Revision Contents

PathPackages
Mdepcheck/__init__.py (16 lines)

Diff 707

View Options

depcheck/__init__.py

Show First 20 Lines • Show All 124 Lines • ▼ Show 20 Line(s)65def run(rpms, arch, repos, report_format="updates", workdir=None):
125 125​
126 output = squash_results.format_output(run_result, arch, report_format) 126​ output = squash_results.format_output(run_result, arch, report_format)
127 log.logger.info(output) 127​ log.logger.info(output)
128 128​
129 return output 129​ return output
130 130​
131def depcheck_cli(): 131​def depcheck_cli():
132 parser = argparse.ArgumentParser() 132​ parser = argparse.ArgumentParser()
133 parser.add_argument("rpm", nargs='+', help="RPM to be tested") 133​ parser.add_argument("rpm", nargs='+', help="RPMs to be tested")
134 parser.add_argument("-a", "--arch", choices=["i386", "x86_64", "armhfp"], help=""" 134​ parser.add_argument("-a", "--arch", choices=["i386", "x86_64", "armhfp"], help="""
135 Architecture to be tested; support arches are x86, x86_64, and armhfp. 135​ Architecture to be tested. If omitted, defaults to the current
136 If omitted, defaults to current machine architecture. 136​ machine's architecture.
137 """) 137​ """)
138 parser.add_argument("-r", "--repos", nargs='+', action='store', help=""" 138​ parser.add_argument("-r", "--repo", action="append", dest="repos", help="""
139 Repo to be tested against, in the form of reponame:repolocation where 139​ Repo to be tested against. Repo can be local (in the form /dir/of/repo)
140 repolocation can be local (in the form /dir/of/repo) or 140​ or remote (direct link or standard metalink).
141 remote (direct link or standard metalink), to be tested against. 141​ Can be used multiple times, to specify more repos.
142 """) 142​ """)
143 parser.add_argument("-f", "--format", choices=["rpms", "updates"], help=""" 143​ parser.add_argument("-f", "--format", choices=["rpms", "updates"], help="""
144 Specify output format to override configuration 144​ Specify output format to override configuration.
145 """) 145​ """)
146 146​
147 147​
148 args = parser.parse_args() 148​ args = parser.parse_args()
149 # autodetect arch if none is passed in 149​ # autodetect arch if none is passed in
150 arch = args.arch 150​ arch = args.arch
151 if arch is None: 151​ if arch is None:
152 arch = platform.machine() 152​ arch = platform.machine()
Show All 11 Lines