From c98b060072eedda602681f658caaff421e837b66 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 17 Jun 2009 16:20:30 +0000 Subject: [PATCH] fix bug when removing authorites, check for authority record type --- geni/methods/remove.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/geni/methods/remove.py b/geni/methods/remove.py index 6ac8ad57..e16cdbe0 100644 --- a/geni/methods/remove.py +++ b/geni/methods/remove.py @@ -46,12 +46,9 @@ class remove(Method): self.api.plshell.DeleteSlice(self.api.plauth, record.get_pointer()) elif type == "node": self.api.plshell.DeleteNode(self.api.plauth, record.get_pointer()) - elif (type == "sa") or (type == "ma"): - if (type == "sa"): - other_rec = table.resolve("ma", record.get_name()) - elif (type == "ma"): - other_rec = table.resolve("sa", record.get_name()) - + elif (type in ['authority', 'sa', 'ma']): + other_rec = table.resolve(type, record.get_name()) + if other_rec: # sa and ma both map to a site, so if we are deleting one # but the other still exists, then do not delete the site -- 2.43.0