Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/w/7.70/bugfix/UTAPI-100/utapi_py…
Browse files Browse the repository at this point in the history
…thon_version_fix' into w/8.1/bugfix/UTAPI-100/utapi_python_version_fix
  • Loading branch information
tmacro committed May 7, 2024
2 parents ce89418 + ae904b8 commit 79c2ff0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/reindex/s3_bucketd.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def inner(*args, **kwargs):
return urllib.parse.quote(val.encode('utf-8'))
return inner

Bucket = namedtuple('Bucket', ['userid', 'name', 'object_lock_enabled'], defaults=[False])
Bucket = namedtuple('Bucket', ['userid', 'name', 'object_lock_enabled'])
MPU = namedtuple('MPU', ['bucket', 'key', 'upload_id'])
BucketContents = namedtuple('BucketContents', ['bucket', 'obj_count', 'total_size'])

Expand Down Expand Up @@ -178,7 +178,7 @@ def get_next_marker(p):
buckets = []
for result in payload.get('Contents', []):
match = re.match("(\w+)..\|..(\w+.*)", result['key'])
bucket = Bucket(*match.groups())
bucket = Bucket(*match.groups(), False)
if name is None or bucket.name == name:
# We need to get the attributes for each bucket to determine if it is locked
if self._only_latest_when_locked:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"engines": {
"node": ">=16"
},
"version": "8.1.13",
"version": "8.1.14",
"description": "API for tracking resource utilization and reporting metrics",
"main": "index.js",
"repository": {
Expand Down

0 comments on commit 79c2ff0

Please sign in to comment.