Merge branch 'better-local-name'

* better-local-name:
  Get local name from qubesdb

debian/control

@@ -42,6 +42,7 @@ Architecture: any
 Depends:
  python3-docutils,
  python3-lxml,
+ python3-qubesdb,
  python3-rpm,
  python3-tqdm,
  ${python3:Depends},

qubesadmin/app.py

@@ -41,6 +41,12 @@
 import qubesadmin.config
 import qubesadmin.devices
 
+try:
+    import qubesdb
+    has_qubesdb = True
+except ImportError:
+    has_qubesdb = False
+
 
 class VMCollection(object):
     """Collection of VMs objects"""
@@ -257,7 +263,18 @@ def remove_pool(self, name):
     def local_name(self):
         """ Get localhost name """
         if not self._local_name:
-            self._local_name = os.uname()[1]
+            local_name = None
+            if has_qubesdb:
+                try:
+                    local_qdb = qubesdb.QubesDB()
+                    local_name_b = local_qdb.read('/name')
+                    if local_name_b:
+                        local_name = local_name_b.decode()
+                except qubesdb.Error:
+                    pass
+            if local_name is None:
+                local_name = os.uname()[1]
+            self._local_name = local_name
 
         return self._local_name
 

rpm_spec/qubes-core-admin-client.spec.in

@@ -39,6 +39,7 @@ Requires:   python%{python3_pkgversion}-daemon
 Requires:   python%{python3_pkgversion}-docutils
 Requires:   python%{python3_pkgversion}-lxml
 Requires:   python%{python3_pkgversion}-xcffib
+Requires:   python%{python3_pkgversion}-qubesdb
 Requires:   python%{python3_pkgversion}-rpm
 Requires:   python%{python3_pkgversion}-tqdm
 Requires:   python%{python3_pkgversion}-pyxdg

test-packages/qubesdb.py

@@ -0,0 +1,6 @@
+class QubesDB:
+    def read(self, key):
+        return b'testvm'
+
+class Error(Exception):
+    pass