Merge lp:~therve/landscape-client/no-changer-no-proxy into lp:~landscape/landscape-client/trunk

[Thomas Herve]

This is a rather trivial fix: we just need to check that the directory exists before trying to lock the file.

[Kevin McDermott (bigkevmcd)]

Trivial fix indeed :-)

review: Approve

[Jamu Kakar (jkakar)]

It'd be better if there were tests for this code, but I think we can
leave that for the future. Thanks for the quick fix, +1!

review: Approve

=== modified file 'scripts/landscape-dbus-proxy'
--- scripts/landscape-dbus-proxy	2010-06-10 18:26:18 +0000
+++ scripts/landscape-dbus-proxy	2010-07-09 14:52:58 +0000
@@ -66,14 +66,17 @@
         connected.addCallback(cb_connected)
 
 
-config = Configuration()
-lock_filename = os.path.join(config.data_path, "package", "changer.lock")
-try:
-    lock_path(lock_filename)
-except LockError:
-    # The package-changer is running, this means that we're upgrading from
-    # a non-AMP version and that the upgrade is Landscape driven, so let's
-    # expose the DBus broker proxy to give a chance to the package-changer
-    # to send its result message.
-    remote = BrokerDBusObject(config)
-    reactor.run()
+if __name__ == "__main__":
+    config = Configuration()
+    lock_dir = os.path.join(config.data_path, "package")
+    if os.path.isdir(lock_dir):
+        lock_filename = os.path.join(lock_dir, "changer.lock")
+        try:
+            lock_path(lock_filename)
+        except LockError:
+            # The package-changer is running, this means that we're upgrading from
+            # a non-AMP version and that the upgrade is Landscape driven, so let's
+            # expose the DBus broker proxy to give a chance to the package-changer
+            # to send its result message.
+            remote = BrokerDBusObject(config)
+            reactor.run()