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

Don't try to walk over files when building archive

Browse source
This commit is contained in:
Ben Doherty 2016-06-01 08:29:28 -04:00 committed by Matt Clay
parent 42112060b5
commit 87c8a21d16
1 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -230,40 +230,49 @@ def main():
arcfile = tarfile.open(dest, 'w|' + compression)
for path in archive_paths:
basename = ''
if os.path.isdir(path):
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
# Prefix trees in the archive with their basename, unless specifically prevented with '.'
if not path.endswith(os.sep + '.'):
basename = os.path.basename(path) + os.sep
for dirpath, dirnames, filenames in os.walk(path, topdown=True):
for dirname in dirnames:
fullpath = dirpath + os.sep + dirname
# Recurse into directories
for dirpath, dirnames, filenames in os.walk(path, topdown=True):
for dirname in dirnames:
fullpath = dirpath + os.sep + dirname
try:
if compression == 'zip':
arcfile.write(fullpath, basename + dirname)
else:
arcfile.add(fullpath, basename + dirname, recursive=False)
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, dest):
try:
if compression == 'zip':
arcfile.write(fullpath, basename + filename)
arcfile.write(fullpath, basename + dirname)
else:
arcfile.add(fullpath, basename + filename, recursive=False)
arcfile.add(fullpath, basename + dirname, recursive=False)
successes.append(fullpath)
except Exception:
e = get_exception()
errors.append('Adding %s: %s' % (path, str(e)))
errors.append('%s: %s' % (fullpath, str(e)))
for filename in filenames:
fullpath = dirpath + os.sep + filename
if not filecmp.cmp(fullpath, dest):
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)))
else:
if compression == 'zip':
arcfile.write(path, path[len(arcroot):])
else:
arcfile.add(path, path[len(arcroot):], recursive=False)
successes.append(path)
except Exception:
e = get_exception()