Merge pull request 'Made some help texts more informative.' (#4611) from mikem/koji:pr-4254-recover into master

Reviewed-on: #4611

cli/koji_cli/commands.py

@@ -596,9 +596,11 @@ def handle_build(options, session, args):
                       help="Wait on the build, even if running in the background")
     parser.add_option("--nowait", action="store_false", dest="wait", help="Don't wait on build")
     parser.add_option("--wait-repo", action="store_true",
-                      help="Wait for a current repo for the build tag")
+                      help="Wait for a current repo for the build tag before building")
     parser.add_option("--wait-build", metavar="NVR", action="append", dest="wait_builds",
-                      default=[], help="Wait for the given nvr to appear in buildroot repo")
+                      default=[],
+                      help="Wait for the given NVR to appear in the build tag, "
+                           "then wait for a current repo before building")
     parser.add_option("--quiet", action="store_true",
                       help="Do not print the task information", default=options.quiet)
     parser.add_option("--arch-override", help="Override build arches")
@@ -869,9 +871,11 @@ def handle_wrapper_rpm(options, session, args):
     parser.add_option("--create-draft", action="store_true",
                       help="Create a new draft build instead")
     parser.add_option("--wait-repo", action="store_true",
-                      help="Wait for a current repo for the build tag")
+                      help="Wait for a current repo for the build tag before building")
     parser.add_option("--wait-build", metavar="NVR", action="append", dest="wait_builds",
-                      default=[], help="Wait for the given nvr to appear in buildroot repo")
+                      default=[],
+                      help="Wait for the given NVR to appear in the build tag, "
+                           "then wait for a current repo before building")
 
     (build_opts, args) = parser.parse_args(args)
     if build_opts.inis:
@@ -7588,9 +7592,11 @@ def anon_handle_wait_repo(options, session, args):
     parser.add_option("--target", action="store_true",
                       help="Interpret the argument as a build target name")
     parser.add_option("--request", action="store_true",
-                      help="Create a repo request (requires auth)")
+                      help="Request refreshing the repo and wait until the "
+                           "refresh is done (requires auth)")
     parser.add_option("--no-request", action="store_false", dest="request",
-                      help="Do not create a repo request (the default)")
+                      help="Do not request refreshing the repo, just wait for "
+                           "it to happen (the default)")
     parser.add_option("--timeout", type="int", default=120,
                       help="Amount of time to wait (in minutes) before giving up "
                            "(default: 120)")

tests/test_cli/test_build.py

@@ -168,8 +168,10 @@ Options:
   --no-rebuild-srpm     Force not to rebuild srpm for scratch build only
   --wait                Wait on the build, even if running in the background
   --nowait              Don't wait on build
-  --wait-repo           Wait for a current repo for the build tag
-  --wait-build=NVR      Wait for the given nvr to appear in buildroot repo
+  --wait-repo           Wait for a current repo for the build tag before
+                        building
+  --wait-build=NVR      Wait for the given NVR to appear in the build tag,
+                        then wait for a current repo before building
   --quiet               Do not print the task information
   --arch-override=ARCH_OVERRIDE
                         Override build arches

tests/test_cli/test_wait_repo.py

@@ -236,8 +236,10 @@ Options:
   --build=NVR        Check that the given build is in the newly-generated repo
                      (may be used multiple times)
   --target           Interpret the argument as a build target name
-  --request          Create a repo request (requires auth)
-  --no-request       Do not create a repo request (the default)
+  --request          Request refreshing the repo and wait until the refresh is
+                     done (requires auth)
+  --no-request       Do not request refreshing the repo, just wait for it to
+                     happen (the default)
   --timeout=TIMEOUT  Amount of time to wait (in minutes) before giving up
                      (default: 120)
   -v, --verbose      Be verbose

tests/test_cli/test_wrapper_rpm.py

@@ -268,8 +268,10 @@ Options:
   --nowait              Don't wait on build
   --background          Run the build at a lower priority
   --create-draft        Create a new draft build instead
-  --wait-repo           Wait for a current repo for the build tag
-  --wait-build=NVR      Wait for the given nvr to appear in buildroot repo
+  --wait-repo           Wait for a current repo for the build tag before
+                        building
+  --wait-build=NVR      Wait for the given NVR to appear in the build tag,
+                        then wait for a current repo before building
 """ % self.progname)