valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check for existing files

Browse Source
This commit is contained in:
Joseph Hall 2015-06-29 10:27:38 -06:00
parent c7c8e1e603
commit 8df9833b60
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/client/spm.py
View File

@ -112,6 +112,22 @@ class SPMClient(parsers.SPMParser):
log.error('Invalid package: the {0} was not found'.format(field)) log.error('Invalid package: the {0} was not found'.format(field))
return False return False
pkg_files = formula_tar.getmembers()
# First pass: check for files that already exist
existing_files = []
for member in pkg_files:
if member.isdir():
continue
out_file = os.path.join(out_path, member.name)
if os.path.exists(out_file):
existing_files.append(out_file)
if not self.opts['force']:
log.error('{0} already exists, not installing'.format(out_file))
if existing_files and not self.opts['force']:
return
# We've decided to install
conn.execute('INSERT INTO packages VALUES (?, ?, ?, ?, ?, ?)', ( conn.execute('INSERT INTO packages VALUES (?, ?, ?, ?, ?, ?)', (
name, name,
formula_def['version'], formula_def['version'],
@ -120,7 +136,7 @@ class SPMClient(parsers.SPMParser):
formula_def['summary'], formula_def['summary'],
formula_def['description'], formula_def['description'],
)) ))
pkg_files = formula_tar.getmembers() # Second pass: install the files
for member in pkg_files: for member in pkg_files:
file_ref = formula_tar.extractfile(member) file_ref = formula_tar.extractfile(member)
if member.isdir(): if member.isdir():