diff --git a/qubes/ext/qubesmanager.py b/qubes/ext/qubesmanager.py deleted file mode 100644 index 9db9b3371..000000000 --- a/qubes/ext/qubesmanager.py +++ /dev/null @@ -1,70 +0,0 @@ -# -# The Qubes OS Project, https://www.qubes-os.org/ -# -# Copyright (C) 2014-2015 Joanna Rutkowska -# Copyright (C) 2014 Marek Marczykowski-Górecki -# -# Copyright (C) 2015 Wojtek Porczyk -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, see . -# - -'''Qubes Manager hooks. - -.. warning:: API defined here is not declared stable. -''' - -import dbus -import qubes.ext - - -class QubesManager(qubes.ext.Extension): - def __init__(self, *args, **kwargs): - super(QubesManager, self).__init__(*args, **kwargs) - try: - self._system_bus = dbus.SystemBus() - except dbus.exceptions.DBusException: - # we can't access Qubes() object here to check for offline mode, - # so lets assume it is this case... - self._system_bus = None - - # pylint: disable=no-self-use,unused-argument,too-few-public-methods - - @qubes.ext.handler('status:error') - def on_status_error(self, vm, event, status, message): - if self._system_bus is None: - return - try: - qubes_manager = self._system_bus.get_object( - 'org.qubesos.QubesManager', - '/org/qubesos/QubesManager') - qubes_manager.notify_error(vm.name, message, - dbus_interface='org.qubesos.QubesManager') - except dbus.DBusException: - # ignore the case when no qubes-manager is running - pass - - @qubes.ext.handler('status:no-error') - def on_status_no_error(self, vm, event, status, message): - if self._system_bus is None: - return - try: - qubes_manager = self._system_bus.get_object( - 'org.qubesos.QubesManager', - '/org/qubesos/QubesManager') - qubes_manager.clear_error_exact(vm.name, message, - dbus_interface='org.qubesos.QubesManager') - except dbus.DBusException: - # ignore the case when no qubes-manager is running - pass diff --git a/rpm_spec/core-dom0.spec.in b/rpm_spec/core-dom0.spec.in index 5b9623373..0a9fdd739 100644 --- a/rpm_spec/core-dom0.spec.in +++ b/rpm_spec/core-dom0.spec.in @@ -278,7 +278,6 @@ fi %{python3_sitelib}/qubes/ext/gui.py %{python3_sitelib}/qubes/ext/audio.py %{python3_sitelib}/qubes/ext/pci.py -%{python3_sitelib}/qubes/ext/qubesmanager.py %{python3_sitelib}/qubes/ext/r3compatibility.py %{python3_sitelib}/qubes/ext/services.py %{python3_sitelib}/qubes/ext/windows.py diff --git a/setup.py b/setup.py index ddbc132eb..1a606cafa 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,6 @@ def run(self): 'qubes.ext': [ 'qubes.ext.admin = qubes.ext.admin:AdminExtension', 'qubes.ext.core_features = qubes.ext.core_features:CoreFeatures', - 'qubes.ext.qubesmanager = qubes.ext.qubesmanager:QubesManager', 'qubes.ext.gui = qubes.ext.gui:GUI', 'qubes.ext.audio = qubes.ext.audio:AUDIO', 'qubes.ext.r3compatibility = qubes.ext.r3compatibility:R3Compatibility',