Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def cp_upload(manifest, dataset, dataset_zip, raw_filenames):
bypass_upload = False

if len(existing_datasets) > 1:
raise CarbonPortalException(f'Dataset would deprecate multiple datasets {existing_datasets["dobj"]}')
raise CarbonPortalException(f'Dataset would deprecate multiple datasets: {list(existing_datasets["dobj"])}')
elif existing_datasets.empty:
# Just to be explicit: We will upload the dataset and don't need to deprecate anything
pass
Expand Down Expand Up @@ -139,6 +139,7 @@ def cp_upload(manifest, dataset, dataset_zip, raw_filenames):

upload_l0 = True
previous_l0 = []

existing_hashsums = existing_l0.loc[existing_l0['fileName'] == basename]['hashSum'].values
if hashsum in existing_hashsums:
upload_l0 = False
Expand Down