diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-05-31 18:02:40 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-05-31 18:02:40 +0200 |
| commit | b838e36176c48331a40cdcee690eddb6cd530c62 (patch) | |
| tree | bba5d034ec784597d78fe1e05dc1d7fe7a7b48d5 /DistUpgrade | |
| parent | 5d10bc5a047becae518c0c4a879b359a3a11798e (diff) | |
| download | python-apt-b838e36176c48331a40cdcee690eddb6cd530c62.tar.gz | |
* DistUpgrade/DistUpgradeControler.py:
- fix free space calculation
Diffstat (limited to 'DistUpgrade')
| -rw-r--r-- | DistUpgrade/Changelog | 3 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog index 13f3fe06..a9786895 100644 --- a/DistUpgrade/Changelog +++ b/DistUpgrade/Changelog @@ -1,6 +1,5 @@ 2006-05-30: - - added a segv handler that writes into - /var/log/dist-upgrade-segv.log + - fix bug in the free space calculation (#47092) 2006-05-24: - if the initial "update()" fails, just exit, don't try to restore the old sources.list (nothing was modified yet) diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 9ab18523..7602075c 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -289,7 +289,7 @@ class DistUpgradeControler(object): if st_archivedir == st_usr: # we are on the same filesystem, so we need to take the space # for downloading the debs into account - free -= self.cache.additionalRequiredSpace + free -= self.cache.requiredDownload logging.debug("/usr on same fs as %s, taking dl-size into account, new free: %s" % (archivedir, free)) else: free = st_usr[statvfs.F_BAVAIL]*st_usr[statvfs.F_FRSIZE] |