From 1fc5ef52f8288e501ea12c890de378c576aba80f Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Apr 08 2019 18:39:27 +0000
Subject: Improvements for scratch module builds:

- Allow module-build-watch to exit when a scratch build completes.
- Add scratch status to module-build-info output.

Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>

---

diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
index e0b6f23..7f2b181 100644
--- a/pyrpkg/__init__.py
+++ b/pyrpkg/__init__.py
@@ -3211,6 +3211,7 @@ class Commands(object):
         print('Name:           {0}'.format(data['name']))
         print('Stream:         {0}'.format(data['stream']))
         print('Version:        {0}'.format(data['version']))
+        print('Scratch:        {0}'.format(data.get('scratch', False)))
         print('Koji Tag:       {0}'.format(data['koji_tag']))
         print('Owner:          {0}'.format(data['owner']))
         print('State:          {0}'.format(data['state_name']))
@@ -3779,7 +3780,9 @@ class Commands(object):
 
             yield module_builds
 
-            all_builds_finish = all(item['state_name'] in ('ready', 'failed')
+            all_builds_finish = all((item['state_name'] in ('ready', 'failed')
+                                     or (item['state_name'] == 'done'
+                                         and item.get('scratch', False)))
                                     for item in module_builds)
             if all_builds_finish:
                 break
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 0773d22..85874ad 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -2692,6 +2692,7 @@ class TestModulesCli(FakeKojiCreds, CliTestCase):
 Name:           python3-ecosystem
 Stream:         master
 Version:        20171010145511
+Scratch:        False
 Koji Tag:       module-14050f52e62d955b
 Owner:          torsava
 State:          failed