Author: tmckay
Date: 2011-06-15 12:58:50 +0000 (Wed, 15 Jun 2011)
New Revision: 4833
Modified:
branches/clarity/mint/python/mint/update.py
Log:
Merge 4831 from trunk.
Tweak for BZ702440, remove special case for collector on delete_agent_objects
Modified: branches/clarity/mint/python/mint/update.py
===================================================================
--- branches/clarity/mint/python/mint/update.py 2011-06-15 12:57:16 UTC (rev 4832)
+++ branches/clarity/mint/python/mint/update.py 2011-06-15 12:58:50 UTC (rev 4833)
@@ -614,7 +614,7 @@
def delete_agent_objects(self, cursor, stats, agent, bound_classes, bound_packages):
def loop_body(cls):
- if cls._storage != "none" and cls is not
self.model.com_redhat_grid.Collector:
+ if cls._storage != "none": # and cls is not
self.model.com_redhat_grid.Collector:
count = cls.delete_selection(cursor, _qmf_agent_id=agent.id)
stats.objects_deleted += count
#stats.objects_deleted_by_class[cls] += count
Show replies by date