also get checksum on 'any' if it is a file
fixes #42785
(cherry picked from commit 0718a53b07
)
This commit is contained in:
parent
a0cf6d7930
commit
8a91c36d64
1 changed files with 6 additions and 4 deletions
|
@ -268,7 +268,7 @@ def contentfilter(fsname, pattern):
|
|||
if prog.match(line):
|
||||
return True
|
||||
|
||||
except:
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return False
|
||||
|
@ -280,12 +280,12 @@ def statinfo(st):
|
|||
|
||||
try: # user data
|
||||
pw_name = pwd.getpwuid(st.st_uid).pw_name
|
||||
except:
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
try: # group data
|
||||
gr_name = grp.getgrgid(st.st_gid).gr_name
|
||||
except:
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return {
|
||||
|
@ -393,7 +393,7 @@ def main():
|
|||
|
||||
try:
|
||||
st = os.lstat(fsname)
|
||||
except:
|
||||
except Exception:
|
||||
msg += "%s was skipped as it does not seem to be a valid file or it cannot be accessed\n" % fsname
|
||||
continue
|
||||
|
||||
|
@ -402,6 +402,8 @@ def main():
|
|||
if pfilter(fsobj, params['patterns'], params['excludes'], params['use_regex']) and agefilter(st, now, age, params['age_stamp']):
|
||||
|
||||
r.update(statinfo(st))
|
||||
if stat.S_ISREG(st.st_mode) and params['get_checksum']:
|
||||
r['checksum'] = module.sha1(fsname)
|
||||
filelist.append(r)
|
||||
|
||||
elif stat.S_ISDIR(st.st_mode) and params['file_type'] == 'directory':
|
||||
|
|
Loading…
Reference in a new issue