Merge pull request #572 from goozbach/devel
fixes #569 apt module problems on old versions of apt-python
This commit is contained in:
commit
626e4cb003
1 changed files with 6 additions and 2 deletions
|
@ -28,6 +28,10 @@ import subprocess
|
||||||
import syslog
|
import syslog
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
|
# added to stave off future warnings about apt api
|
||||||
|
import warnings;
|
||||||
|
warnings.filterwarnings('ignore', "apt API not stable yet", FutureWarning)
|
||||||
|
|
||||||
APT_PATH = "/usr/bin/apt-get"
|
APT_PATH = "/usr/bin/apt-get"
|
||||||
APT = "DEBIAN_PRIORITY=critical %s" % APT_PATH
|
APT = "DEBIAN_PRIORITY=critical %s" % APT_PATH
|
||||||
|
|
||||||
|
@ -172,11 +176,11 @@ cache = apt.Cache()
|
||||||
if default_release:
|
if default_release:
|
||||||
apt_pkg.config['APT::Default-Release'] = default_release
|
apt_pkg.config['APT::Default-Release'] = default_release
|
||||||
# reopen cache w/ modified config
|
# reopen cache w/ modified config
|
||||||
cache.open()
|
cache.open(progress=None)
|
||||||
|
|
||||||
if update_cache == 'yes':
|
if update_cache == 'yes':
|
||||||
cache.update()
|
cache.update()
|
||||||
cache.open()
|
cache.open(progress=None)
|
||||||
if package == None:
|
if package == None:
|
||||||
exit_json(changed=False)
|
exit_json(changed=False)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue