saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Move import/error messaging logic for snapper module into __virtual__()"

Browse source 
This reverts commit 640db5b5ac.

This isn't the right approach. We need the "snapper" object throughout the rest
of the module.
This commit is contained in:
rallytime 2016-12-20 11:41:57 -07:00
parent 640db5b5ac
commit b8c16094c4
2 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
salt/modules/snapper.py
View file

@ -2,8 +2,6 @@
'''
Module to manage filesystem snapshots with snapper
.. versionadded:: 2016.11.0
:codeauthor: Duncan Mac-Vicar P. <dmacvicar@suse.de>
:codeauthor: Pablo Suárez Hernández <psuarezhernandez@suse.de>
@ -52,37 +50,39 @@ SNAPPER_DBUS_OBJECT = 'org.opensuse.Snapper'
SNAPPER_DBUS_PATH = '/org/opensuse/Snapper'
SNAPPER_DBUS_INTERFACE = 'org.opensuse.Snapper'
log = logging.getLogger(__name__) # pylint: disable=invalid-name
# pylint: disable=invalid-name
log = logging.getLogger(__name__)
bus = None
system_bus_error = None
snapper = None
snapper_error = None
if HAS_DBUS:
try:
bus = dbus.SystemBus()
except dbus.DBusException as exc:
log.error(exc)
system_bus_error = exc
else:
if SNAPPER_DBUS_OBJECT in bus.list_activatable_names():
try:
snapper = dbus.Interface(bus.get_object(SNAPPER_DBUS_OBJECT,
SNAPPER_DBUS_PATH),
dbus_interface=SNAPPER_DBUS_INTERFACE)
except (dbus.DBusException, ValueError) as exc:
log.error(exc)
snapper_error = exc
else:
snapper_error = 'snapper is missing'
# pylint: enable=invalid-name
def __virtual__():
bus = None
system_bus_error = None
snapper = None
snapper_error = None
error_msg = 'The snapper module cannot be loaded: {0}'
if HAS_DBUS:
try:
bus = dbus.SystemBus()
except dbus.DBusException as exc:
log.error(exc)
system_bus_error = exc
else:
if bus and SNAPPER_DBUS_OBJECT in bus.list_activatable_names():
try:
snapper = dbus.Interface(bus.get_object(SNAPPER_DBUS_OBJECT,
SNAPPER_DBUS_PATH),
dbus_interface=SNAPPER_DBUS_INTERFACE)
except (dbus.DBusException, ValueError) as exc:
log.error(exc)
snapper_error = exc
else:
snapper_error = 'snapper is missing'
else:
if not HAS_DBUS:
return False, error_msg.format('missing python dbus module')
if not snapper:
elif not snapper:
return False, error_msg.format(snapper_error)
elif not bus:
return False, error_msg.format(system_bus_error)

2
salt/states/snapper.py
View file

@ -3,8 +3,6 @@
Managing implicit state and baselines using snapshots
=====================================================
.. versionadded:: 2016.11.0
Salt can manage state against explicitly defined state, for example
if your minion state is defined by: