cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4872 from timurbatyrshin/4869-old-python-apt-fix

Browse source 
#4869 compatibility with older versions of apt
This commit is contained in:
jctanner 2013-12-13 10:43:47 -08:00
commit f9121ba27c
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
packaging/apt
View file

@ -181,20 +181,29 @@ def package_status(m, pkgname, version, cache, state):
except AttributeError: except AttributeError:
has_files = False # older python-apt cannot be used to determine non-purged has_files = False # older python-apt cannot be used to determine non-purged
try:
package_is_installed = ll_pkg.current_state == apt_pkg.CURSTATE_INSTALLED
except AttributeError: # python-apt 0.7.X has very weak low-level object
try:
# might not be necessary as python-apt post-0.7.X should have current_state property
package_is_installed = pkg.is_installed
except AttributeError:
# assume older version of python-apt is installed
package_is_installed = pkg.isInstalled
if version: if version:
try : try:
return ll_pkg.current_state == apt_pkg.CURSTATE_INSTALLED and \ installed_version = pkg.installed.version
fnmatch.fnmatch(pkg.installed.version, version), False, has_files
except AttributeError: except AttributeError:
#assume older version of python-apt is installed installed_version = pkg.installedVersion
return ll_pkg.current_state == apt_pkg.CURSTATE_INSTALLED and \ return package_is_installed and fnmatch.fnmatch(installed_version, version), False, has_files
fnmatch.fnmatch(pkg.installedVersion, version), False, has_files
else: else:
try : try:
return ll_pkg.current_state == apt_pkg.CURSTATE_INSTALLED, pkg.is_upgradable, has_files package_is_upgradable = pkg.is_upgradable
except AttributeError: except AttributeError:
#assume older version of python-apt is installed # assume older version of python-apt is installed
return ll_pkg.current_state == apt_pkg.CURSTATE_INSTALLED, pkg.isUpgradable, has_files package_is_upgradable = pkg.isUpgradable
return package_is_installed, package_is_upgradable, has_files
def expand_dpkg_options(dpkg_options_compressed): def expand_dpkg_options(dpkg_options_compressed):
options_list = dpkg_options_compressed.split(',') options_list = dpkg_options_compressed.split(',')