"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "salt/fileserver/s3fs.py" between
salt-2019.2.0.tar.gz and salt-2019.2.1.tar.gz

About: SaltStack is a systems management software for data center automation, cloud orchestration, server provisioning, configuration management and more. Community version.

s3fs.py  (salt-2019.2.0):s3fs.py  (salt-2019.2.1)
skipping to change at line 447 skipping to change at line 447
# s3 query returned nothing # s3 query returned nothing
if not s3_meta: if not s3_meta:
continue continue
# grab only the files/dirs # grab only the files/dirs
bucket_files[bucket_name] = [k for k in s3_meta if 'Key' in k] bucket_files[bucket_name] = [k for k in s3_meta if 'Key' in k]
bucket_files_list.append(bucket_files) bucket_files_list.append(bucket_files)
# check to see if we added any keys, otherwise investigate possi ble error conditions # check to see if we added any keys, otherwise investigate possi ble error conditions
if len(bucket_files[bucket_name]) == 0: if not bucket_files[bucket_name]:
meta_response = {} meta_response = {}
for k in s3_meta: for k in s3_meta:
if 'Code' in k or 'Message' in k: if 'Code' in k or 'Message' in k:
# assumes no duplicate keys, consisdent with current erro response. # assumes no duplicate keys, consisdent with current erro response.
meta_response.update(k) meta_response.update(k)
# attempt use of human readable output first. # attempt use of human readable output first.
try: try:
log.warning("'%s' response for bucket '%s'", meta_respon se['Message'], bucket_name) log.warning("'%s' response for bucket '%s'", meta_respon se['Message'], bucket_name)
continue continue
except KeyError: except KeyError:
skipping to change at line 486 skipping to change at line 486
s3_meta = __get_s3_meta(bucket_name) s3_meta = __get_s3_meta(bucket_name)
# s3 query returned nothing # s3 query returned nothing
if not s3_meta: if not s3_meta:
continue continue
# pull out the environment dirs (e.g. the root dirs) # pull out the environment dirs (e.g. the root dirs)
files = [k for k in s3_meta if 'Key' in k] files = [k for k in s3_meta if 'Key' in k]
# check to see if we added any keys, otherwise investigate possible error conditions # check to see if we added any keys, otherwise investigate possible error conditions
if len(files) == 0: if not files:
meta_response = {} meta_response = {}
for k in s3_meta: for k in s3_meta:
if 'Code' in k or 'Message' in k: if 'Code' in k or 'Message' in k:
# assumes no duplicate keys, consisdent with current err o response. # assumes no duplicate keys, consisdent with current err o response.
meta_response.update(k) meta_response.update(k)
# attempt use of human readable output first. # attempt use of human readable output first.
try: try:
log.warning("'%s' response for bucket '%s'", meta_response[' Message'], bucket_name) log.warning("'%s' response for bucket '%s'", meta_response[' Message'], bucket_name)
continue continue
except KeyError: except KeyError:
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)