Skip to content

Commit 425e7fe

Browse files
committed
Small update
1 parent af624ec commit 425e7fe

1 file changed

Lines changed: 15 additions & 23 deletions

File tree

pycatfile/pycatfile.py

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6693,49 +6693,45 @@ def AppendFilesWithContentFromBSDTarFileToList(infile, extradata=[], jsondata={}
66936693
fname = member.pathname
66946694
if(verbose):
66956695
VerbosePrintOut(fname)
6696-
if(hasattr(member, "mode")):
6697-
fpremode = member.mode
6698-
ffullmode = member.mode
6699-
elif(hasattr(member, "perm")):
6700-
fpremode = member.perm
6701-
ffullmode = member.perm
6696+
fpremode = member.mode
6697+
ffullmode = member.mode
67026698
flinkcount = 0
67036699
fblksize = format(int(0), 'x').lower()
67046700
fblocks = format(int(0), 'x').lower()
67056701
fflags = format(int(0), 'x').lower()
67066702
ftype = 0
67076703
if((hasattr(member, "isreg") and member.isreg) or member.isfile):
6708-
ffullmode = ffullmode | stat.S_IFREG
6704+
ffullmode = member.mode | stat.S_IFREG
67096705
ftype = 0
67106706
elif(member.islnk):
6711-
ffullmode = ffullmode | stat.S_IFREG
6707+
ffullmode = member.mode | stat.S_IFREG
67126708
ftype = 1
67136709
elif(member.issym):
6714-
ffullmode = ffullmode | stat.S_IFLNK
6710+
ffullmode = member.mode | stat.S_IFLNK
67156711
ftype = 2
67166712
elif(member.ischr):
6717-
ffullmode = ffullmode | stat.S_IFCHR
6713+
ffullmode = member.mode | stat.S_IFCHR
67186714
ftype = 3
67196715
elif(member.isblk):
6720-
ffullmode = ffullmode | stat.S_IFBLK
6716+
ffullmode = member.mode | stat.S_IFBLK
67216717
ftype = 4
67226718
elif(member.isdir):
6723-
ffullmode = ffullmode | stat.S_IFDIR
6719+
ffullmode = member.mode | stat.S_IFDIR
67246720
ftype = 5
67256721
elif(member.isfifo):
6726-
ffullmode = ffullmode | stat.S_IFIFO
6722+
ffullmode = member.mode | stat.S_IFIFO
67276723
ftype = 6
67286724
elif(hasattr(member, "issparse") and member.issparse):
6729-
ffullmode = ffullmode | stat.S_IFREG
6725+
ffullmode = member.mode | stat.S_IFREG
67306726
ftype = 12
67316727
elif(member.isdev):
6732-
ffullmode = ffullmode
6728+
ffullmode = member.mode
67336729
ftype = 14
67346730
elif(member.issock):
6735-
ffullmode = ffullmode | stat.S_IFSOCK
6731+
ffullmode = member.mode | stat.S_IFSOCK
67366732
ftype = 15
67376733
else:
6738-
ffullmode = ffullmode | stat.S_IFREG
6734+
ffullmode = member.mode | stat.S_IFREG
67396735
ftype = 0
67406736
flinkname = ""
67416737
fcurfid = format(int(curfid), 'x').lower()
@@ -10021,12 +10017,8 @@ def BSDTarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=
1002110017
with open_archive_reader(infile) as archive:
1002210018
for member in archive:
1002310019
returnval.update({lcfi: member.pathname})
10024-
if(hasattr(member, "mode")):
10025-
fpremode = member.mode
10026-
ffullmode = member.mode
10027-
elif(hasattr(member, "perm")):
10028-
fpremode = member.perm
10029-
ffullmode = member.perm
10020+
fpremode = member.mode
10021+
ffullmode = member.mode
1003010022
flinkcount = 0
1003110023
ftype = 0
1003210024
if((hasattr(member, "isreg") and member.isreg) or member.isfile):

0 commit comments

Comments
 (0)