← Back to branch summary

~free.ekanayaka/landscape-client/lucid-1.4.4-0ubuntu0.10.04

« back to all changes in this revision

Viewing changes to landscape/watchdog.py

  • Committer: Bazaar Package Importer
  • Author(s): Free Ekanayaka
  • Date: 2009-12-16 10:50:05 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20091216105005-svplwdorkgz6vja7
Tags: 1.4.0-0ubuntu0.10.04.0
https://launchpad.net/bugs/456124
https://launchpad.net/bugs/340843
https://launchpad.net/bugs/450629
https://launchpad.net/bugs/455217
https://launchpad.net/bugs/462543
https://launchpad.net/bugs/463321
* New upstream release with several bug fixes:
  - Fix landscape daemons fail to start when too many groups are
    available (LP: #456124)
  - Fix landscape programs wake up far too much. (LP: #340843)
  - Fix Package manager fails with 'no such table: task' (LP #465846)
  - Fix test suite leaving temporary files around (LP #476418)
  - Fix the 1hr long wait for user data to be uploaded following a
    resynchronisation (LP #369000)

* Add support for Ubuntu release upgrades:
  - Add helper function to fetch many files at once (LP: #450629)
  - Handle release-upgrade messages in the packagemanager
    plugin (LP: #455217)
  - Add a release-upgrader task handler (LP: #462543)
  - Support upgrade-tool environment variables (LP: #463321)

* Add initial support for Smart package locking:
  - Detect and report changes about Smart package locks (#488108)

* Packaging fixes:
  - Turn unnecessary Pre-Depends on python-gobject into a regular Depends
  - If it's empty, remove /etc/landscape upon purge

Show diffs side-by-side

added added

removed removed

Lines of Context:
landscape/watchdog.py
447
447
 
448
448
    def startService(self):
449
449
        Service.startService(self)
450
 
 
451
450
        bootstrap_list.bootstrap(data_path=self._config.data_path,
452
451
                                 log_dir=self._config.log_dir)
453
452
 
492
491
        return done
493
492
 
494
493
    def _remove_pid(self):
495
 
        if os.access(self._config.pid_file, os.W_OK):
496
 
            stream = open(self._config.pid_file)
 
494
        pid_file = self._config.pid_file
 
495
        if pid_file is not None and os.access(pid_file, os.W_OK):
 
496
            stream = open(pid_file)
497
497
            pid = stream.read()
498
498
            stream.close()
499
499
            if pid == str(os.getpid()):
500
 
                os.unlink(self._config.pid_file)
 
500
                os.unlink(pid_file)
501
501
 
502
502
 
503
503
bootstrap_list = BootstrapList([
504
504
    BootstrapDirectory("$data_path", "landscape", "root", 0755),
505
505
    BootstrapDirectory("$data_path/package", "landscape", "root", 0755),
506
506
    BootstrapDirectory("$data_path/package/hash-id", "landscape", "root", 0755),
 
507
    BootstrapDirectory(
 
508
        "$data_path/package/upgrade-tool", "landscape", "root", 0755),
507
509
    BootstrapDirectory("$data_path/messages", "landscape", "root", 0755),
508
510
    BootstrapDirectory(
509
511
        "$data_path/custom-graph-scripts", "landscape", "root", 0755),