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

Refactor zip and tarfile loops together, branch where calls are different

Browse source 
This fixed a few bugs and simplified the code
This commit is contained in:
Ben Doherty 2016-05-31 23:42:37 -04:00 committed by Matt Clay
parent 8fc2a22b4c
commit fb03fc8eb1
1 changed files with 38 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
lib/ansible/modules/extras/files/archive.py
View file

@ -220,58 +220,54 @@ def main():
if state != 'archive':
try:
# Easier compression using tarfile module
if compression == 'gz' or compression == 'bz2':
arcfile = tarfile.open(creates, 'w|' + compression)
arcfile.add(arcroot, os.path.basename(arcroot), recursive=False)
for path in archive_paths:
basename = ''
# Prefix trees in the archive with their basename, unless specifically prevented with '.'
if os.path.isdir(path) and not path.endswith(os.sep + '.'):
basename = os.path.basename(path) + os.sep
try:
def exclude_creates(f):
if os.path.exists(f.name) and not filecmp.cmp(f.name, creates):
return f
return None
arcfile.add(path, basename + path[len(arcroot):], filter=exclude_creates)
successes.append(path)
except:
e = get_exception()
errors.append('error adding %s: %s' % (path, str(e)))
# Slightly more difficult (and less efficient!) compression using zipfile module
elif compression == 'zip':
if compression == 'zip':
arcfile = zipfile.ZipFile(creates, 'w', zipfile.ZIP_DEFLATED)
for path in archive_paths:
basename = ''
# Easier compression using tarfile module
elif compression == 'gz' or compression == 'bz2':
arcfile = tarfile.open(creates, 'w|' + compression)
# Prefix trees in the archive with their basename, unless specifically prevented with '.'
if os.path.isdir(path) and not path.endswith(os.sep + '.'):
basename = os.path.basename(path) + os.sep
for path in archive_paths:
basename = ''
for dirpath, dirnames, filenames in os.walk(path, topdown=True):
for dirname in dirnames:
arcfile.write(dirpath + os.sep + dirname, basename + dirname)
for filename in filenames:
fullpath = dirpath + os.sep + filename
# Prefix trees in the archive with their basename, unless specifically prevented with '.'
if os.path.isdir(path) and not path.endswith(os.sep + '.'):
basename = os.path.basename(path) + os.sep
if not filecmp.cmp(fullpath, creates):
arcfile.write(fullpath, basename + filename)
for dirpath, dirnames, filenames in os.walk(path, topdown=True):
for dirname in dirnames:
fullpath = dirpath + os.sep + dirname
successes.append(path)
try:
if compression == 'zip':
arcfile.write(fullpath, basename + dirname)
else:
arcfile.add(fullpath, basename + dirname, recursive=False)
except OSError:
except Exception:
e = get_exception()
errors.append('%s: %s' % (fullpath, str(e)))
for filename in filenames:
fullpath = dirpath + os.sep + filename
if not filecmp.cmp(fullpath, creates):
try:
if compression == 'zip':
arcfile.write(fullpath, basename + filename)
else:
arcfile.add(fullpath, basename + filename, recursive=False)
successes.append(fullpath)
except Exception:
e = get_exception()
errors.append('Adding %s: %s' % (path, str(e)))
except Exception:
e = get_exception()
module.fail_json(msg='Error when writing %s archive at %s: %s' % (compression == 'zip' and 'zip' or ('tar.' + compression), creates, str(e)))
return module.fail_json(msg='Error when writing %s archive at %s: %s' % (compression == 'zip' and 'zip' or ('tar.' + compression), creates, str(e)))
if arcfile:
arcfile.close()