@@ -654,7 +654,7 @@ def _get(section_dict, key, default=None):
654654__version_date__ = str(__version_date_info__[0]) + "." + str(
655655 __version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
656656__revision__ = __version_info__[3]
657- __revision_id__ = "$Id$"
657+ __revision_id__ = "$Id: 02113c1ccc2b1bd416e655477699c14de9f87674 $"
658658if(__version_info__[4] is not None):
659659 __version_date_plusrc__ = __version_date__ + \
660660 "-" + str(__version_date_info__[4])
@@ -6010,8 +6010,7 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
60106010 curfid = curfid + 1
60116011 if(ftype == 2):
60126012 flinkname = os.readlink(fname)
6013- if(not os.path.exists(flinkname)):
6014- return False
6013+ if(not os.path.exists(fname)):
60156014 try:
60166015 fdev = fstatinfo.st_rdev
60176016 except AttributeError:
@@ -6124,10 +6123,9 @@ def AppendFilesWithContent(infiles, fp, dirlistfromtxt=False, extradata=[], json
61246123 fcompression = curcompression
61256124 fcontents.close()
61266125 fcontents = cfcontents
6127- elif followlink and (ftype == 1 or ftype == 2 ):
6128- if(not os.path.exists(flinkname )):
6126+ elif followlink and (ftype == 2 or ftype in data_types ):
6127+ if(not os.path.exists(fname )):
61296128 return False
6130- flstatinfo = os.stat(flinkname)
61316129 with open(flinkname, "rb") as fpc:
61326130 shutil.copyfileobj(fpc, fcontents, length=__filebuff_size__)
61336131 typechecktest = CheckCompressionType(fcontents, filestart=0, closefp=False)
0 commit comments