Stop conversion of domains list to set

It loses the input order the user intended.

Author: ben-grande

qubesadmin/tests/tools/init.py

@@ -149,3 +149,26 @@ def test_105_set_prop_positional(self):
         args = parser.parse_args(['testvalue'])
         self.assertIn(
             ('testprop', 'testvalue'), args.properties.items())
+
+
+class TC_02_QubesArgumentParser(qubesadmin.tests.QubesTestCase):
+    def test_000_domain_preserve_order(self):
+        self.app.expected_calls[('dom0', 'admin.vm.List', None, None)] = (
+            b'0\x00some-vm class=AppVM state=Running\n'
+            b'some-a class=AppVM state=Halted\n'
+            b'some-b class=AppVM state=Paused\n'
+        )
+
+        parser = qubesadmin.tools.QubesArgumentParser(vmname_nargs="+")
+        wanted_args = ["some-vm", "some-a", "some-vm"]
+        args = parser.parse_args(wanted_args, app=self.app)
+        self.assertEqual(
+            ["some-a", "some-b", "some-vm"],
+            [qube.name for qube in self.app.domains],
+            "app namespace must have domains in alphabetical order",
+        )
+        self.assertEqual(
+            ["some-vm", "some-a"],
+            [qube.name for qube in args.domains],
+            "args namespace must have domains in input order",
+        )

qubesadmin/tools/__init__.py

@@ -191,14 +191,18 @@ def parse_qubes_app(self, parser, namespace):
                     except KeyError:
                         parser.error('no such domain: {!r}'.format(vm_name))
             else:
-                destinations = set()
+                destinations = []
                 for destination in getattr(namespace, self.dest):
                     if any(wildcard in destination for wildcard in '*?[!]'):
-                        for domain in app.domains:
+                        for domain in [
+                            qube
+                            for qube in app.domains
+                            if qube.name not in destinations
+                        ]:
                             if fnmatch.fnmatch(domain.name, destination):
-                                destinations.add(domain.name)
-                    else:
-                        destinations.add(destination)
+                                destinations.append(domain.name)
+                    elif destination not in destinations:
+                        destinations.append(destination)
 
                 for vm_name in destinations:
                     try: