Skip to content

Commit d95e4b7

Browse files
authored
Add files via upload
1 parent 242b915 commit d95e4b7

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

pyarchivefile.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ def _get(section_dict, key, default=None):
647647
__version_date__ = str(__version_date_info__[0]) + "." + str(
648648
__version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
649649
__revision__ = __version_info__[3]
650-
__revision_id__ = "$Id$"
650+
__revision_id__ = "$Id: 603c45e1d44ecdc3312f7509decf6f5a8b2f63cf $"
651651
if(__version_info__[4] is not None):
652652
__version_date_plusrc__ = __version_date__ + \
653653
"-" + str(__version_date_info__[4])
@@ -6003,7 +6003,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
60036003
curfid = curfid + 1
60046004
if(ftype == 2):
60056005
flinkname = os.readlink(fname)
6006-
if(not os.path.exists(flinkname)):
6006+
if(not os.path.exists(fname)):
60076007
return False
60086008
try:
60096009
fdev = fstatinfo.st_rdev
@@ -6117,10 +6117,9 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
61176117
fcompression = curcompression
61186118
fcontents.close()
61196119
fcontents = cfcontents
6120-
elif followlink and (ftype == 1 or ftype == 2):
6121-
if(not os.path.exists(flinkname)):
6120+
elif followlink and (ftype == 2 or ftype in data_types):
6121+
if(not os.path.exists(fname)):
61226122
return False
6123-
flstatinfo = os.stat(flinkname)
61246123
with open(flinkname, "rb") as fpc:
61256124
shutil.copyfileobj(fpc, fcontents, length=__filebuff_size__)
61266125
typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)

0 commit comments

Comments
 (0)