From 1447ecad5737737882d47af70eaf69dadc32b8d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 24 May 2017 21:53:08 +0200 Subject: [PATCH] dom0-updates: migrate qubes-receive-updates script to use Admin API Don't import qubes.xml directly. --- dom0-updates/qubes-receive-updates | 4 ++-- rpm_spec/core-dom0-linux.spec | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dom0-updates/qubes-receive-updates b/dom0-updates/qubes-receive-updates index 89e95e2..4b6860c 100755 --- a/dom0-updates/qubes-receive-updates +++ b/dom0-updates/qubes-receive-updates @@ -25,7 +25,7 @@ import sys import subprocess import shutil import grp -import qubes +import qubesadmin updates_dir = "/var/lib/qubes/updates" updates_rpm_dir = updates_dir + "/rpm" @@ -129,7 +129,7 @@ def handle_dom0updates(updatevm): def main(): - app = qubes.Qubes() + app = qubesadmin.Qubes() updatevm = app.updatevm if updatevm is None: diff --git a/rpm_spec/core-dom0-linux.spec b/rpm_spec/core-dom0-linux.spec index 8e73cbd..84c385d 100644 --- a/rpm_spec/core-dom0-linux.spec +++ b/rpm_spec/core-dom0-linux.spec @@ -46,6 +46,7 @@ BuildRequires: pandoc BuildRequires: qubes-utils-devel >= 3.1.3 BuildRequires: qubes-libvchan-devel Requires: qubes-core-dom0 +Requires: python3-qubesadmin Requires: qubes-utils >= 3.1.3 Requires: %{name}-kernel-install Requires: xdotool