saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #26826 from techhat/spmunreg

Browse source 
Pass a package name to unregister_file()
This commit is contained in:
Michael Steed 2015-09-01 15:04:30 -06:00
commit 5e5c5bdb5f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/spm/__init__.py
View file

@ -422,11 +422,11 @@ class SPMClient(object):
self.pkgfiles['{0}.remove_file'.format(self.files_prov)](filerow[0], self.files_conn)
else:
log.trace('Not removing file {0}'.format(filerow[0]))
self.pkgdb['{0}.unregister_file'.format(self.db_prov)](filerow[0], self.db_conn)
self.pkgdb['{0}.unregister_file'.format(self.db_prov)](filerow[0], package, self.db_conn)
# Clean up directories
for dir_ in sorted(dirs, reverse=True):
self.pkgdb['{0}.unregister_file'.format(self.db_prov)](dir_, self.db_conn)
self.pkgdb['{0}.unregister_file'.format(self.db_prov)](dir_, package, self.db_conn)
try:
log.trace('Removing directory {0}'.format(dir_))
os.rmdir(dir_)

2
salt/spm/pkgdb/sqlite3.py
View file

@ -177,7 +177,7 @@ def unregister_pkg(name, conn=None):
conn.execute('DELETE FROM packages WHERE package=?', (name, ))
def unregister_file(path, conn=None):
def unregister_file(path, pkg=None, conn=None): # pylint: disable=W0612
'''
Unregister a file from the package database
'''