pseudoclients will no longer magically reappear after server restart if you request...

diff --git a/pyva/pyva/src/main/python/pseudoclient/collection.py b/pyva/pyva/src/main/python/pseudoclient/collection.py
index 32622909c0f3e5a3f001b4d2e5b5f0abc4f104e8..7601ce532ef54c38a654469e28fd20118be888a7 100644 (file)
--- a/pyva/pyva/src/main/python/pseudoclient/collection.py
+++ b/pyva/pyva/src/main/python/pseudoclient/collection.py
@@ -175,6 +175,8 @@ class CollectionManager(InvariantCollection):
                        self.set_dirty(entity)
                        entity.registered = True
                        self[item] = entity
+                       if entity in self.__deleted_items:
+                               self.__deleted_items.remove(entity)
 
                self.on_added(item)
 
@@ -193,6 +195,8 @@ class CollectionManager(InvariantCollection):
                elif not entity.banned:
                        if not item.lower() in self.__deleted_items:
                                self.__deleted_items.append(entity)
+                       if entity in self.__dirty_items:
+                               self.__dirty_items.remove(entity)
 
                        del(self[item])
 

diff --git a/pyva/pyva/src/main/python/pseudoclient/sys_channels.py b/pyva/pyva/src/main/python/pseudoclient/sys_channels.py
index 8ceb4ab70664b14fca022f1659e1058009a70099..1f1535b0efefb0b5730c3d9239c8c15e7d2f23df 100644 (file)
--- a/pyva/pyva/src/main/python/pseudoclient/sys_channels.py
+++ b/pyva/pyva/src/main/python/pseudoclient/sys_channels.py
@@ -6,6 +6,11 @@ class Channel(CollectionEntity):
                CollectionEntity.__init__(self, id)
                self.name = name
        
+       def __eq__(self, other):
+               if (type(other) is Channel):
+                       return self.name == other.name
+               return False
+       
        news = None
 
 class ChannelManager(CollectionManager, Subsystem):