From f162322b3535fa9983e3b4f28d32d39089a7d758 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Mon, 18 Oct 2021 10:16:14 +0200 Subject: [PATCH] Fix bad merge we've changed the import --- lib/galaxy/managers/collections.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/managers/collections.py b/lib/galaxy/managers/collections.py index 2d7d6572c8b..b5ff49189d0 100644 --- a/lib/galaxy/managers/collections.py +++ b/lib/galaxy/managers/collections.py @@ -19,7 +19,10 @@ from galaxy.security.idencoding import IdEncodingHelper from galaxy.util import ( validation ) -from .hdas import HDAManager +from .hdas import ( + HDAManager, + HistoryDatasetAssociationNoHistoryException, +) from .histories import HistoryManager from .lddas import LDDAManager @@ -266,7 +269,7 @@ class DatasetCollectionManager: for dataset in dataset_collection_instance.collection.dataset_instances: try: self.hda_manager.error_unless_owner(dataset, user=trans.get_user(), current_history=trans.history) - except hdas.HistoryDatasetAssociationNoHistoryException: + except HistoryDatasetAssociationNoHistoryException: log.info("Cannot delete HistoryDatasetAssociation {}, HistoryDatasetAssociation has no associated History, cannot verify owner".format(dataset.id)) continue if not dataset.deleted: