Skip to content

Commit 1787c78

Browse files
authored
Merge pull request #229 from GeoNode/fixup_delete
Fix delete resource
2 parents b2b038c + c17cd7c commit 1787c78

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

importer/publisher.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@ def extract_resource_to_publish(
4949
files, action, layer_name, alternate, **kwargs
5050
)
5151

52-
def get_resource(self, resource_name) -> bool:
52+
def get_resource(self, resource_name, return_bool=True) -> bool:
5353
self.get_or_create_store()
5454
_res = self.cat.get_resource(
5555
resource_name, store=self.store, workspace=self.workspace
5656
)
57-
return True if _res else False
57+
if return_bool:
58+
return True if _res else False
59+
return _res
5860

5961
def publish_resources(self, resources: List[str]):
6062
"""
@@ -87,9 +89,9 @@ def overwrite_resources(self, resources: List[str]):
8789
return result
8890

8991
def delete_resource(self, resource_name):
90-
layer = self.get_resource(resource_name)
91-
if layer and layer.resource:
92-
self.cat.delete(layer.resource, purge="all", recurse=True)
92+
layer = self.get_resource(resource_name, return_bool=False)
93+
if layer:
94+
self.cat.delete(layer, purge="all", recurse=True)
9395
store = self.cat.get_store(
9496
resource_name.split(":")[-1],
9597
workspace=os.getenv(

0 commit comments

Comments
 (0)