File tree 2 files changed +8
-2
lines changed 2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change
1
+ 0.12.3
2
+ - enh: improved resource availability check
1
3
0.12.2
2
4
- fix: testing did not append S3 resources
3
5
0.12.1
Original file line number Diff line number Diff line change 4
4
import time
5
5
6
6
from .ckan import get_resource_path
7
+ from . import s3cc
7
8
8
9
9
10
#: Content of the dummy file created when importing data.
@@ -68,8 +69,11 @@ def wait_for_resource(resource_id: str,
68
69
continue
69
70
70
71
s3_ok = res_dict .get ("s3_available" , None )
71
- if s3_ok is not None :
72
- # If the dataset is on S3, it is considered to be available.
72
+ if s3_ok :
73
+ # If the resource is on S3, it is considered to be available.
74
+ break
75
+ elif s3cc .artifact_exists (res_dict ["id" ]):
76
+ # It is on S3, but not yet registered. That's fine.
73
77
break
74
78
elif time .time () - t0 > timeout :
75
79
raise OSError ("Data import seems to take too long "
You can’t perform that action at this time.
0 commit comments