|
|
|
@ -150,25 +150,30 @@ def package_status(m, pkgname, version, cache, state):
|
|
|
|
|
if state == 'install':
|
|
|
|
|
m.fail_json(msg="No package matching '%s' is available" % pkgname)
|
|
|
|
|
else:
|
|
|
|
|
return False, False
|
|
|
|
|
return False, False, False
|
|
|
|
|
try:
|
|
|
|
|
has_files = len(pkg.installed_files) > 0
|
|
|
|
|
except AttributeError:
|
|
|
|
|
has_files = False # older python-apt cannot be used to determine non-purged
|
|
|
|
|
|
|
|
|
|
if version:
|
|
|
|
|
try :
|
|
|
|
|
return pkg.is_installed and fnmatch.fnmatch(pkg.installed.version, version), False
|
|
|
|
|
return pkg.is_installed and fnmatch.fnmatch(pkg.installed.version, version), False, has_files
|
|
|
|
|
except AttributeError:
|
|
|
|
|
#assume older version of python-apt is installed
|
|
|
|
|
return pkg.isInstalled and fnmatch.fnmatch(pkg.installedVersion, version), False
|
|
|
|
|
return pkg.isInstalled and fnmatch.fnmatch(pkg.installedVersion, version), False, has_files
|
|
|
|
|
else:
|
|
|
|
|
try :
|
|
|
|
|
return pkg.is_installed, pkg.is_upgradable
|
|
|
|
|
return pkg.is_installed, pkg.is_upgradable, has_files
|
|
|
|
|
except AttributeError:
|
|
|
|
|
#assume older version of python-apt is installed
|
|
|
|
|
return pkg.isInstalled, pkg.isUpgradable
|
|
|
|
|
return pkg.isInstalled, pkg.isUpgradable, has_files
|
|
|
|
|
|
|
|
|
|
def install(m, pkgspec, cache, upgrade=False, default_release=None, install_recommends=True, force=False):
|
|
|
|
|
packages = ""
|
|
|
|
|
for package in pkgspec:
|
|
|
|
|
name, version = package_split(package)
|
|
|
|
|
installed, upgradable = package_status(m, name, version, cache, state='install')
|
|
|
|
|
installed, upgradable, has_files = package_status(m, name, version, cache, state='install')
|
|
|
|
|
if not installed or (upgrade and upgradable):
|
|
|
|
|
packages += "'%s' " % package
|
|
|
|
|
|
|
|
|
@ -202,8 +207,8 @@ def remove(m, pkgspec, cache, purge=False):
|
|
|
|
|
packages = ""
|
|
|
|
|
for package in pkgspec:
|
|
|
|
|
name, version = package_split(package)
|
|
|
|
|
installed, upgradable = package_status(m, name, version, cache, state='remove')
|
|
|
|
|
if installed:
|
|
|
|
|
installed, upgradable, has_files = package_status(m, name, version, cache, state='remove')
|
|
|
|
|
if installed or (has_files and purge):
|
|
|
|
|
packages += "'%s' " % package
|
|
|
|
|
|
|
|
|
|
if len(packages) == 0:
|
|
|
|
|