=== modified file 'DistUpgrade/DistUpgradeQuirks.py'
--- DistUpgrade/DistUpgradeQuirks.py	2012-03-07 13:41:32 +0000
+++ DistUpgrade/DistUpgradeQuirks.py	2012-12-05 08:36:14 +0000
@@ -433,6 +433,7 @@
         self._killScreensaver()
         self._pokeScreensaver()
         self._stopDocvertConverter()
+        self._workaround_landscape_in_nss()
     def oneiricStartUpgrade(self):
         logging.debug("oneiric StartUpgrade quirks")
         # fix grub issue
@@ -794,6 +795,15 @@
         if os.path.exists("/etc/init.d/apparmor"):
             logging.debug("/etc/init.d/apparmor stop")
             subprocess.call(["/etc/init.d/apparmor","stop"])
+    def _workaround_landscape_in_nss(self):
+        """Workaround for bug #1086548"""
+        if " ldap" in open("/etc/nsswitch.conf").read():
+            LANDSCAPE_STATOVERRIDE = "/usr/lib/landscape/smart-update"
+            logging.debug("ldap entry in nsswitch, temporarily remove %s "
+                          "from statoverride" % LANDSCAPE_STATOVERRIDE)
+            # this will be re-added during the upgrade
+            subprocess.call(["dpkg-statoverride", "--remove",
+                             LANDSCAPE_STATOVERRIDE])
     def _stopDocvertConverter(self):
         " /etc/init.d/docvert-converter stop (see bug #450569)"
         if os.path.exists("/etc/init.d/docvert-converter"):