Merge lp:~therve/landscape-client/hal-soft-dep into lp:~landscape/landscape-client/trunk

[Thomas Herve]

The branch:
 * Handles import error from Hal and Dbus
 * Disable the hardware plugin when hal is not there
 * Use gudev in the mount plugin when hal is not there
 * Makes the packaging changes so that hal and python-dbus are suggested in natty, and depends on gudev instead.

[lp:~therve/landscape-client/hal-soft-dep]

319. By Thomas Herve on 2011-01-31

Ignore pygi log errors

[Free Ekanayaka (free.ekanayaka)]

Looks good, though I didn't test it for real. +1!

review: Approve

[Jamu Kakar (jkakar)]

I've run the tests, but like Free, not tested it for real. Looks good
to me, +1!

review: Approve

=== modified file 'debian/control'
--- debian/control	2011-01-10 21:24:47 +0000
+++ debian/control	2011-01-31 13:37:33 +0000
@@ -35,8 +35,8 @@
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
          python-twisted-web,
-         landscape-common (>= ${Source-Version}),
-         hal
+         landscape-common (>= ${Source-Version})
+Suggests: ${extra:Suggests}
 Description: The Landscape administration system client
  Landscape is a web-based tool for managing Ubuntu systems. This
  package is necessary if you want your machine to be managed in a
 
=== modified file 'debian/landscape-client.init'
--- debian/landscape-client.init	2010-09-07 15:37:59 +0000
+++ debian/landscape-client.init	2011-01-31 13:37:33 +0000
@@ -2,8 +2,8 @@
 
 ### BEGIN INIT INFO
 # Provides: landscape-client
-# Required-Start: $local_fs $remote_fs hal
-# Required-Stop: $local_fs $remote_fs hal
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: Landscape client daemons
 
=== modified file 'debian/rules'
--- debian/rules	2011-01-11 23:04:59 +0000
+++ debian/rules	2011-01-31 13:37:33 +0000
@@ -82,17 +82,23 @@
 ifneq (,$(findstring $(dist_release),"dapper"))
 	# We need python2.4-pysqlite2 and a non-buggy libcurl3-gnutls on dapper
 	echo "extra:Depends=python2.4-pysqlite2, libcurl3-gnutls (>= 7.15.1-1ubuntu3), python-smartpm (>= 1.1.1~bzr20081010-0ubuntu1.6.06.0), python2.4-dbus" >> $(landscape_common_substvars)
-	echo "extra:Depends=python2.4-pycurl" >> $(landscape_client_substvars)
+	echo "extra:Depends=python2.4-pycurl, hal" >> $(landscape_client_substvars)
 endif
 ifneq (,$(findstring $(dist_release),"hardy"))
 	# We want the smart 1.1.1 from the Landscape repository on hardy
 	echo "extra:Depends=python-smartpm (>= 1.1.1~bzr20081010-0ubuntu1.8.04.1), python2.4-dbus" >> $(landscape_common_substvars)
-	echo "extra:Depends=python2.4-pycurl" >> $(landscape_client_substvars)
+	echo "extra:Depends=python2.4-pycurl, hal" >> $(landscape_client_substvars)
 endif
-ifeq (,$(filter $(dist_release),dapper hardy))
+ifneq (,$(filter $(dist_release),karmic lucid maverick))
 	# We want libpam-modules in karmic, and smart 1.2
 	echo "extra:Depends=libpam-modules (>= 1.0.1-9ubuntu3), python-smartpm (>= 1.2-4), python-dbus" >> $(landscape_common_substvars)
-	echo "extra:Depends=python-pycurl" >> $(landscape_client_substvars)
+	echo "extra:Depends=python-pycurl, hal" >> $(landscape_client_substvars)
+endif
+ifeq (,$(filter $(dist_release),dapper hardy karmic lucid maverick))
+	# Starting natty, no more hal or dbus
+	echo "extra:Depends=libpam-modules (>= 1.0.1-9ubuntu3), python-smartpm (>= 1.2-4)" >> $(landscape_common_substvars)
+	echo "extra:Depends=python-pycurl, gir1.2-gudev-1.0 (>= 165-0ubuntu2)" >> $(landscape_client_substvars)
+	echo "extra:Suggests=python-dbus, hal" >> $(landscape_client_substvars)
 endif
 ifeq (,$(filter $(dist_release),dapper hardy karmic))
 	# The python-image-store-proxy package is needed for the eucalyptus plugin
 
=== modified file 'landscape/monitor/hardwareinventory.py'
--- landscape/monitor/hardwareinventory.py	2010-12-10 13:57:11 +0000
+++ landscape/monitor/hardwareinventory.py	2011-01-31 13:37:33 +0000
@@ -5,7 +5,6 @@
 from landscape.lib.log import log_failure
 
 from landscape.diff import diff
-from landscape.hal import HALManager
 from landscape.monitor.plugin import MonitorPlugin
 
 
@@ -17,9 +16,17 @@
         super(HardwareInventory, self).__init__()
         self._persist_sets = []
         self._persist_removes = []
-        self._hal_manager = hal_manager or HALManager()
+        self.enabled = True
+        try:
+            from landscape.hal import HALManager
+        except ImportError:
+            self.enabled = False
+        else:
+            self._hal_manager = hal_manager or HALManager()
 
     def register(self, manager):
+        if not self.enabled:
+            return
         super(HardwareInventory, self).register(manager)
         self.call_on_accepted("hardware-inventory", self.exchange, True)
 
@@ -37,6 +44,8 @@
         return result
 
     def exchange(self, urgent=False):
+        if not self.enabled:
+            return
         return self.registry.broker.call_if_accepted("hardware-inventory",
                                                      self.send_message, urgent)
 
 
=== modified file 'landscape/monitor/mountinfo.py'
--- landscape/monitor/mountinfo.py	2010-12-16 14:58:05 +0000
+++ landscape/monitor/mountinfo.py	2011-01-31 13:37:33 +0000
@@ -4,7 +4,6 @@
 from landscape.lib.disk import get_mount_info
 from landscape.lib.monitor import CoverageMonitor
 from landscape.accumulate import Accumulator
-from landscape.hal import HALManager
 from landscape.monitor.plugin import MonitorPlugin
 
 
@@ -29,7 +28,18 @@
         self._free_space = []
         self._mount_info = []
         self._mount_info_to_persist = None
-        self._hal_manager = hal_manager or HALManager()
+        try:
+            from landscape.hal import HALManager
+        except ImportError:
+            self._hal_manager = hal_manager
+        else:
+            self._hal_manager = hal_manager or HALManager()
+        try:
+            from gi.repository import GUdev
+        except ImportError:
+            self._gudev_client = None
+        else:
+            self._gudev_client = GUdev.Client.new([])
 
     def register(self, registry):
         super(MountInfo, self).register(registry)
@@ -108,6 +118,23 @@
             current_mount_points.add(mount_point)
 
     def _get_removable_devices(self):
+        if self._hal_manager is not None:
+            return self._get_hal_removable_devices()
+        elif self._gudev_client is not None:
+            return self._get_udev_removable_devices()
+        else:
+            return set()
+
+    def _get_udev_removable_devices(self):
+        class is_removable(object):
+            def __contains__(oself, device_name):
+                device = self._gudev_client.query_by_device_file(device_name)
+                if device:
+                    return device.get_sysfs_attr_as_boolean("removable")
+                return False
+        return is_removable()
+
+    def _get_hal_removable_devices(self):
         block_devices = {}  # {udi: [device, ...]}
         children = {}  # {parent_udi: [child_udi, ...]}
         removable = set()
 
=== modified file 'landscape/monitor/tests/test_mountinfo.py'
--- landscape/monitor/tests/test_mountinfo.py	2010-12-10 11:17:11 +0000
+++ landscape/monitor/tests/test_mountinfo.py	2011-01-31 13:37:33 +0000
@@ -19,6 +19,7 @@
     def setUp(self):
         LandscapeTest.setUp(self)
         self.mstore.set_accepted_types(["mount-info", "free-space"])
+        self.log_helper.ignore_errors("Typelib file for namespace")
 
     def get_mount_info(self, *args, **kwargs):
         hal_devices = kwargs.pop("hal_devices", [])
@@ -365,6 +366,35 @@
         message = plugin.create_mount_info_message()
         self.assertEquals(message, None)
 
+    def test_ignore_removable_devices_gudev(self):
+        """
+        The mount info plugin uses gudev to retrieve removable information
+        about devices.
+        """
+        filename = self.makeFile("""\
+/dev/scd0 /media/Xerox_M750 iso9660 ro,nosuid,nodev,uid=1000,utf8 0 0
+""")
+        plugin = self.get_mount_info(mounts_file=filename,
+                                     mtab_file=filename)
+        plugin._hal_manager = None
+
+        class MockDevice(object):
+            def get_sysfs_attr_as_boolean(self, attr):
+                if attr == "removable":
+                    return True
+
+        class MockGudevClient(object):
+            def query_by_device_file(self, name):
+                if name == "/dev/scd0":
+                    return MockDevice()
+
+        plugin._gudev_client = MockGudevClient()
+        self.monitor.add(plugin)
+        plugin.run()
+
+        message = plugin.create_mount_info_message()
+        self.assertEquals(message, None)
+
     def test_ignore_multiparented_removable_devices(self):
         """
         Some removable devices might be the grand-children of a device that is
 
=== modified file 'landscape/monitor/tests/test_service.py'
--- landscape/monitor/tests/test_service.py	2010-08-11 11:56:29 +0000
+++ landscape/monitor/tests/test_service.py	2011-01-31 13:37:33 +0000
@@ -20,6 +20,7 @@
             reactor_factory = FakeReactor
 
         self.service = FakeMonitorService(config)
+        self.log_helper.ignore_errors("Typelib file for namespace")
 
     def test_plugins(self):
         """
 
=== modified file 'landscape/service.py'
--- landscape/service.py	2010-08-11 11:56:29 +0000
+++ landscape/service.py	2011-01-31 13:37:33 +0000
@@ -8,7 +8,6 @@
 from landscape.log import rotate_logs
 from landscape.reactor import TwistedReactor
 from landscape.deployment import get_versioned_persist, init_logging
-from landscape.lib import bpickle_dbus
 
 
 class LandscapeService(Service, object):
@@ -29,7 +28,12 @@
 
     def __init__(self, config):
         self.config = config
-        bpickle_dbus.install()
+        try:
+            from landscape.lib import bpickle_dbus
+        except ImportError:
+            pass
+        else:
+            bpickle_dbus.install()
         self.reactor = self.reactor_factory()
         if self.persist_filename:
             self.persist = get_versioned_persist(self)