@@ -655,7 +655,7 @@ def _get(section_dict, key, default=None):
655655__version_date__ = str(__version_date_info__[0]) + "." + str(
656656 __version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
657657__revision__ = __version_info__[3]
658- __revision_id__ = "$Id$"
658+ __revision_id__ = "$Id: 2890bcc49fa346f603a32a43d6f6602900ddab50 $"
659659if(__version_info__[4] is not None):
660660 __version_date_plusrc__ = __version_date__ + \
661661 "-" + str(__version_date_info__[4])
@@ -6011,8 +6011,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
60116011 curfid = curfid + 1
60126012 if(ftype == 2):
60136013 flinkname = os.readlink(fname)
6014- if(not os.path.exists(flinkname)):
6015- return False
6014+ if(not os.path.exists(fname)):
60166015 try:
60176016 fdev = fstatinfo.st_rdev
60186017 except AttributeError:
@@ -6125,11 +6124,9 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
61256124 fcompression = curcompression
61266125 fcontents.close()
61276126 fcontents = cfcontents
6128- elif followlink and (ftype == 1 or ftype == 2):
6129- if(not os.path.exists(flinkname)):
6127+ elif followlink and (ftype == 2 or ftype in data_types):
61306128 return False
6131- flstatinfo = os.stat(flinkname)
6132- with open(flinkname, "rb") as fpc:
6129+ with open(fname, "rb") as fpc:
61336130 shutil.copyfileobj(fpc, fcontents, length=__filebuff_size__)
61346131 typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
61356132 fcontents.seek(0, 0)
0 commit comments