Introduce non-purged package status
A package may be removed but not purged with APT. The only way to identify this state is by looking at the list of installed files of a package. Even if the package has no files installed, this list will be non-empty until the package is removed: # python -c "import apt; c=apt.Cache(); c.update(); c.open(); p=c['ruby1.8']; print p, p.installed, p.installed_files" <Package: name:'ruby1.8' id:1425> None [u''] # dpkg --purge ruby1.8 (Reading database ... 27904 files and directories currently installed.) Removing ruby1.8 ... Purging configuration files for ruby1.8 ... # python -c "import apt; c=apt.Cache(); c.update(); c.open(); p=c['ruby1.8']; print p, p.installed, p.installed_files" <Package: name:'ruby1.8' id:1425> None [] See http://bugs.debian.org/712749 too. If a package is not marked installed but it still 'has_files', then it should be processed if the request is to purge it. Signed-off-by: martin f. krafft <madduck@madduck.net>
This commit is contained in:
parent
8e37a2bec9
commit
420f7d7ac6
1 changed files with 9 additions and 8 deletions
|
@ -151,25 +151,26 @@ def package_status(m, pkgname, version, cache, state):
|
||||||
if state == 'install':
|
if state == 'install':
|
||||||
m.fail_json(msg="No package matching '%s' is available" % pkgname)
|
m.fail_json(msg="No package matching '%s' is available" % pkgname)
|
||||||
else:
|
else:
|
||||||
return False, False
|
return False, False, False
|
||||||
|
has_files = len(pkg.installed_files) > 0
|
||||||
if version:
|
if version:
|
||||||
try :
|
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:
|
except AttributeError:
|
||||||
#assume older version of python-apt is installed
|
#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:
|
else:
|
||||||
try :
|
try :
|
||||||
return pkg.is_installed, pkg.is_upgradable
|
return pkg.is_installed, pkg.is_upgradable, has_files
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
#assume older version of python-apt is installed
|
#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):
|
def install(m, pkgspec, cache, upgrade=False, default_release=None, install_recommends=True, force=False):
|
||||||
packages = ""
|
packages = ""
|
||||||
for package in pkgspec:
|
for package in pkgspec:
|
||||||
name, version = package_split(package)
|
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):
|
if not installed or (upgrade and upgradable):
|
||||||
packages += "'%s' " % package
|
packages += "'%s' " % package
|
||||||
|
|
||||||
|
@ -203,8 +204,8 @@ def remove(m, pkgspec, cache, purge=False):
|
||||||
packages = ""
|
packages = ""
|
||||||
for package in pkgspec:
|
for package in pkgspec:
|
||||||
name, version = package_split(package)
|
name, version = package_split(package)
|
||||||
installed, upgradable = package_status(m, name, version, cache, state='remove')
|
installed, upgradable, has_files = package_status(m, name, version, cache, state='remove')
|
||||||
if installed:
|
if installed or (has_files and purge):
|
||||||
packages += "'%s' " % package
|
packages += "'%s' " % package
|
||||||
|
|
||||||
if len(packages) == 0:
|
if len(packages) == 0:
|
||||||
|
|
Loading…
Reference in a new issue