← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/landscape-client/oneiric

« back to all changes in this revision

Viewing changes to scripts/landscape-dbus-proxy

  • Committer: Bazaar Package Importer
  • Author(s): Free Ekanayaka
  • Date: 2010-07-28 08:14:02 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: james.westby@ubuntu.com-20100728081402-2ygupluqwc2bbe8j
Tags: 1.5.4-0ubuntu0.10.10.0
https://launchpad.net/bugs/610744
https://launchpad.net/bugs/599338
https://launchpad.net/bugs/603514
https://launchpad.net/bugs/605079
https://launchpad.net/bugs/608314
https://launchpad.net/bugs/608278
* New upstream version (LP: #610744):

  - The Eucalyptus management plugin reports the output of the
    'euca-describe-availability-zones verbose' command, which includes
    information about the available instance types and the maximum
    number of each instance type that the cloud can support (LP: #599338)

  - Check if the package directory exists before trying to check the
    package changer lock in the dbus-proxy. This fixes a bug when upgrading
    a dbus-landscape which never registered (LP: #603514).

  - Allow an LDS server to bootstrap new cloud instances with its own CA,
    which is picked up by the client, written to a file on the instance, and
    used in subsequent exchanges with the server (LP: #605079).

  - Skip loopback interface when reporting device info (LP: #608314)

  - Disable landscape-sysinfo when load is more than 1 (LP: #608278)

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/landscape-dbus-proxy
66
66
        connected.addCallback(cb_connected)
67
67
 
68
68
 
69
 
config = Configuration()
70
 
lock_filename = os.path.join(config.data_path, "package", "changer.lock")
71
 
try:
72
 
    lock_path(lock_filename)
73
 
except LockError:
74
 
    # The package-changer is running, this means that we're upgrading from
75
 
    # a non-AMP version and that the upgrade is Landscape driven, so let's
76
 
    # expose the DBus broker proxy to give a chance to the package-changer
77
 
    # to send its result message.
78
 
    remote = BrokerDBusObject(config)
79
 
    reactor.run()
 
69
if __name__ == "__main__":
 
70
    config = Configuration()
 
71
    lock_dir = os.path.join(config.data_path, "package")
 
72
    if os.path.isdir(lock_dir):
 
73
        lock_filename = os.path.join(lock_dir, "changer.lock")
 
74
        try:
 
75
            lock_path(lock_filename)
 
76
        except LockError:
 
77
            # The package-changer is running, this means that we're upgrading from
 
78
            # a non-AMP version and that the upgrade is Landscape driven, so let's
 
79
            # expose the DBus broker proxy to give a chance to the package-changer
 
80
            # to send its result message.
 
81
            remote = BrokerDBusObject(config)
 
82
            reactor.run()