#56 Fix wait-repo to not wait a minute if --timeout=0 is specified
Merged 9 years ago by mikeb. Opened 9 years ago by tmlcoch.
tmlcoch/koji wait-repo-fix  into  master

file modified
+8 -8
@@ -6571,6 +6571,14 @@ 

                      print "Successfully waited %s for %s to appear in the %s repo" % (koji.util.duration(start), koji.util.printList(suboptions.builds), tag)

                  return

  

+         if (time.time() - start) >= (suboptions.timeout * 60.0):

+             if not suboptions.quiet:

+                 if builds:

+                     print "Unsuccessfully waited %s for %s to appear in the %s repo" % (koji.util.duration(start), koji.util.printList(suboptions.builds), tag)

+                 else:

+                     print "Unsuccessfully waited %s for a new %s repo" % (koji.util.duration(start), tag)

+             return 1

+ 

          time.sleep(60)

          last_repo = repo

          repo = session.getRepo(tag_id)
@@ -6581,14 +6589,6 @@ 

                      print "Successfully waited %s for a new %s repo" % (koji.util.duration(start), tag)

                  return

  

-         if (time.time() - start) > (suboptions.timeout * 60.0):

-             if not suboptions.quiet:

-                 if builds:

-                     print "Unsuccessfully waited %s for %s to appear in the %s repo" % (koji.util.duration(start), koji.util.printList(suboptions.builds), tag)

-                 else:

-                     print "Unsuccessfully waited %s for a new %s repo" % (koji.util.duration(start), tag)

-             return 1

- 

  _search_types = ('package', 'build', 'tag', 'target', 'user', 'host', 'rpm', 'maven', 'win')

  

  def handle_regen_repo(options, session, args):

no initial comment

Looks good! That was easy. :)

Pull-Request has been merged by mikeb

9 years ago
Metadata