diff options
| author | Julian Andres Klode <jak@debian.org> | 2010-02-27 13:27:54 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2010-02-27 13:27:54 +0100 |
| commit | 83521b397a31165de60ad50fe73e684290c52a43 (patch) | |
| tree | a5b8947695c6a0f69211dd1eb9377d16d936147c /apt/cache.py | |
| parent | 930f6a2899b0b410777397fb206a8eba8c99100c (diff) | |
| parent | e5237896629a9fc7ba123b6248eff19d6440cf19 (diff) | |
| download | python-apt-83521b397a31165de60ad50fe73e684290c52a43.tar.gz | |
Merge the mvo branch
[ Michael Vogt ]
* apt/cache.py:
- call install_progress.startUpdate()/finishUpdate() to keep
compatibility with older code
* apt/progress/base.py:
- restore "self.statusfd, self.writefd" type, provide additional
self.status_stream and self.write_stream file like objects
* python/progress.cc:
- try to call compatibility functions first, then new functions
Diffstat (limited to 'apt/cache.py')
| -rw-r--r-- | apt/cache.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apt/cache.py b/apt/cache.py index 24d63361..b5733d98 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -328,15 +328,16 @@ class Cache(object): The second parameter *install_progress* refers to an InstallProgress() object of the module apt.progress. """ + # compat with older API try: - install_progress.start_update() - except AttributeError: install_progress.startUpdate() + except AttributeError: + install_progress.start_update() res = install_progress.run(pm) try: - install_progress.finish_update() - except AttributeError: install_progress.finishUpdate() + except AttributeError: + install_progress.finish_update() return res @deprecated_args |