remove dead code around args.wait

Author: anon

qubesadmin/tools/qvm_shutdown.py

@@ -71,33 +71,32 @@ def main(args=None, app=None):  # pylint: disable=missing-docstring
 
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
-    remaining_domains = args.domains
+    remaining_domains = set(args.domains)
     for _ in range(len(args.domains)):
-        this_round_domains = set(remaining_domains)
-        if not this_round_domains:
+        if not remaining_domains:
             break
-        remaining_domains = set()
+        shutdown_failed = set()
         if not args.dry_run:
-            for vm in this_round_domains:
+            for vm in remaining_domains:
                 try:
                     vm.shutdown(force=force)
                 except qubesadmin.exc.QubesVMNotStartedError:
                     pass
                 except qubesadmin.exc.QubesException as e:
                     if not args.wait:
                         vm.log.error('Shutdown error: {}'.format(e))
-                    else:
-                        remaining_domains.add(vm)
+                    shutdown_failed.add(vm)
         if not args.wait:
             if shutdown_failed:
                 parser.error_runtime(
                     'Failed to shut down: ' +
                     ', '.join(vm.name for vm in shutdown_failed),
                     len(shutdown_failed))
             return
-        this_round_domains.difference_update(remaining_domains)
-        if not this_round_domains:
-            # no VM shutdown request succeed, no sense to try again
+        awaiting = remaining_domains - shutdown_failed
+        remaining_domains = shutdown_failed
+        if not awaiting:
+            # no VM shutdown request succeeded, no sense to try again
             break
 
         try:
@@ -107,7 +106,7 @@ def main(args=None, app=None):  # pylint: disable=missing-docstring
                     awaiting), args.timeout))
         except (TimeoutError, asyncio.TimeoutError):
             if not args.dry_run:
-                current_vms = failed_domains(this_round_domains)
+                current_vms = failed_domains(awaiting)
                 if current_vms:
                     args.app.log.info(
                         'Killing remaining qubes: {}'
@@ -121,14 +120,13 @@ def main(args=None, app=None):  # pylint: disable=missing-docstring
                     except qubesadmin.exc.QubesException as e:
                         parser.error_runtime(e)
 
-    if args.wait:
-        loop.close()
-        failed = failed_domains(args.domains)
-        if failed:
-            parser.error_runtime(
-                'Failed to shut down: ' +
-                ', '.join(vm.name for vm in failed),
-                len(failed))
+    loop.close()
+    failed = failed_domains(args.domains)
+    if failed:
+        parser.error_runtime(
+            'Failed to shut down: ' +
+            ', '.join(vm.name for vm in failed),
+            len(failed))
 
 
 if __name__ == '__main__':