Skip to content

Commit e582125

Browse files
committed
Small update
1 parent c45adf1 commit e582125

1 file changed

Lines changed: 15 additions & 23 deletions

File tree

pyneofile/pyneofile.py

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6687,49 +6687,45 @@ def AppendFilesWithContentFromBSDTarFileToList(infile, extradata=[], jsondata={}
66876687
fname = member.pathname
66886688
if(verbose):
66896689
VerbosePrintOut(fname)
6690-
if(hasattr(member, "mode")):
6691-
fpremode = member.mode
6692-
ffullmode = member.mode
6693-
elif(hasattr(member, "perm")):
6694-
fpremode = member.perm
6695-
ffullmode = member.perm
6690+
fpremode = member.mode
6691+
ffullmode = member.mode
66966692
flinkcount = 0
66976693
fblksize = format(int(0), 'x').lower()
66986694
fblocks = format(int(0), 'x').lower()
66996695
fflags = format(int(0), 'x').lower()
67006696
ftype = 0
67016697
if((hasattr(member, "isreg") and member.isreg) or member.isfile):
6702-
ffullmode = ffullmode | stat.S_IFREG
6698+
ffullmode = member.mode | stat.S_IFREG
67036699
ftype = 0
67046700
elif(member.islnk):
6705-
ffullmode = ffullmode | stat.S_IFREG
6701+
ffullmode = member.mode | stat.S_IFREG
67066702
ftype = 1
67076703
elif(member.issym):
6708-
ffullmode = ffullmode | stat.S_IFLNK
6704+
ffullmode = member.mode | stat.S_IFLNK
67096705
ftype = 2
67106706
elif(member.ischr):
6711-
ffullmode = ffullmode | stat.S_IFCHR
6707+
ffullmode = member.mode | stat.S_IFCHR
67126708
ftype = 3
67136709
elif(member.isblk):
6714-
ffullmode = ffullmode | stat.S_IFBLK
6710+
ffullmode = member.mode | stat.S_IFBLK
67156711
ftype = 4
67166712
elif(member.isdir):
6717-
ffullmode = ffullmode | stat.S_IFDIR
6713+
ffullmode = member.mode | stat.S_IFDIR
67186714
ftype = 5
67196715
elif(member.isfifo):
6720-
ffullmode = ffullmode | stat.S_IFIFO
6716+
ffullmode = member.mode | stat.S_IFIFO
67216717
ftype = 6
67226718
elif(hasattr(member, "issparse") and member.issparse):
6723-
ffullmode = ffullmode | stat.S_IFREG
6719+
ffullmode = member.mode | stat.S_IFREG
67246720
ftype = 12
67256721
elif(member.isdev):
6726-
ffullmode = ffullmode
6722+
ffullmode = member.mode
67276723
ftype = 14
67286724
elif(member.issock):
6729-
ffullmode = ffullmode | stat.S_IFSOCK
6725+
ffullmode = member.mode | stat.S_IFSOCK
67306726
ftype = 15
67316727
else:
6732-
ffullmode = ffullmode | stat.S_IFREG
6728+
ffullmode = member.mode | stat.S_IFREG
67336729
ftype = 0
67346730
flinkname = ""
67356731
fcurfid = format(int(curfid), 'x').lower()
@@ -10015,12 +10011,8 @@ def BSDTarFileListFiles(infile, formatspecs=__file_format_multi_dict__, verbose=
1001510011
with open_archive_reader(infile) as archive:
1001610012
for member in archive:
1001710013
returnval.update({lcfi: member.pathname})
10018-
if(hasattr(member, "mode")):
10019-
fpremode = member.mode
10020-
ffullmode = member.mode
10021-
elif(hasattr(member, "perm")):
10022-
fpremode = member.perm
10023-
ffullmode = member.perm
10014+
fpremode = member.mode
10015+
ffullmode = member.mode
1002410016
flinkcount = 0
1002510017
ftype = 0
1002610018
if((hasattr(member, "isreg") and member.isreg) or member.isfile):

0 commit comments

Comments
 (0)