~free.ekanayaka/landscape-client/intrepid

« back to all changes in this revision

Viewing changes to landscape/sysinfo/disk.py

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug, Christopher Armstrong, Mathias Gug
  • Date: 2008-09-19 17:28:08 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20080919172808-9r1jno2qs2doozru
Tags: 1.0.21-0ubuntu1
[ Christopher Armstrong ]
* New upstream release (LP: #271886):
  - Bug fix release:
  - Avoid the PotentialZombieWarning on landscape-client startup.
   (LP: #257346)
  - When run as root, read sysinfo configuration from /etc and and write
    logs to /var/log instead of /root. (LP: #268560)
  - Avoid ZeroDivisionErrors when /home is an autofs. (LP: #269634)
  - Don't corrupt a pid file when trying to start the client when it's
    already running. (LP: #269634)
  - Remove the pid file when shutting down the client. (LP: #257081)

[ Mathias Gug ]
* debian/landscape-client.init: specify the pid file and use --startas
  instead of --exec when starting landscape-client so that the init script
  doesn't fail if landscape-client is already running.

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
        main_info = get_filesystem_for_path("/home", self._mounts_file,
35
35
                                            self._statvfs)
36
36
        total = main_info["total-space"]
 
37
        if total <= 0:
 
38
            main_info = get_filesystem_for_path("/", self._mounts_file,
 
39
                                                self._statvfs)
 
40
            total = main_info["total-space"]
 
41
        if total <= 0:
 
42
            main_usage = "unknown"
 
43
        else:
 
44
            main_usage = usage(main_info)
37
45
        self._sysinfo.add_header("Usage of " + main_info["mount-point"],
38
 
                                 usage(main_info))
 
46
                                 main_usage)
39
47
 
40
48
        seen_mounts = set()
41
49
        seen_devices = set()