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

bytearray isn't available in python2.4 (#3583)

Browse source 
* Detection of handler depends on the wrong handler failing to list the contents of the tarfile.

Use explicit compression types with the python tarfile library to
achieve that.

* bytearray isn't available in python2.4
This commit is contained in:
Toshio Kuratomi 2016-05-02 11:29:04 -07:00 committed by Matt Clay
parent cd26cc8a0d
commit fa00c69ff2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/files/unarchive.py
View file

@ -345,7 +345,7 @@ class ZipArchive(object):
diff += 'c%s++++++.?? %s\n' % (ftype, path) diff += 'c%s++++++.?? %s\n' % (ftype, path)
continue continue
itemized = bytearray('.%s.......??' % ftype) itemized = list('.%s.......??' % ftype)
dt_object = datetime.datetime(*(time.strptime(pcs[6], '%Y%m%d.%H%M%S')[0:6])) dt_object = datetime.datetime(*(time.strptime(pcs[6], '%Y%m%d.%H%M%S')[0:6]))
timestamp = time.mktime(dt_object.timetuple()) timestamp = time.mktime(dt_object.timetuple())
@ -444,7 +444,7 @@ class ZipArchive(object):
if change: if change:
if path not in self.includes: if path not in self.includes:
self.includes.append(path) self.includes.append(path)
diff += '%s %s\n' % (itemized, path) diff += '%s %s\n' % (''.join(itemized), path)
if self.includes: if self.includes:
unarchived = False unarchived = False