Changeset 2225

Timestamp:

09/07/06 21:55:18 (4 years ago)

Author:

desai

Message:

Switch to new calling scheme (Frame.Verify -> Tool.Verify)

Location:

branches/refactor/client/src/lib/Client

Files:

• Frame.py (added)
• Tools/Bases.py (modified) (1 diff)
• Tools/POSIX.py (modified) (1 diff)
• __init__.py (modified) (1 diff)

branches/refactor/client/src/lib/Client/Tools/Bases.py

@@ -67 +67 @@
                 raise toolInstantiationError
 
-    def VerifyEntry(self, entry, modlist):
-        '''VerifyEntry dispatches to the proper method per-class\nReturns True/False'''
-        return False
+    def Verify(self):
+        '''Verify all pertinent entries'''
+        pass
 
-    def InstallEntry(self, entry):
-        '''InstallEntry dispatches to the proper install method call\nReturns True/False'''
-        return False
+    def Install(self, whitelist = []):
+        '''Install all supported entries in sublist, if specified'''
+        pass
 
-    def FindExtra(self):
-        '''Find per-type extra entries that are not reflected in the configuration'''
-        return []
+    def handlesEntry(self, entry):
+        '''return if entry is handled by this Tool'''
+        return (entry.tag, entry.get('type')) in self.__handles__
 
-    def Install(self, subset = []):
-        '''Install all supported entries in sublist, if specified'''
-        return False
+    def buildModlist(self, entry, struct):
+        '''Build a list of potentially modified POSIX paths for this entry'''
+        if entry.tag != 'Package' or struct.tag != 'Bundle':
+            return []
+        return [sentry.get('name') for sentry in struct if sentry.tag in \
+                ['ConfigFile', 'SymLink', 'Directory']]

branches/refactor/client/src/lib/Client/Tools/POSIX.py

@@ -29 +29 @@
                    ('SymLink', None)]
 
-    def VerifyEntry(self, entry, modlist):
+    def Verify(self, entry):
         '''Dispatch verify calls to underlying methods'''
-        func = getattr(self, "Verify%s" % (entry.tag))
-        self.states[entry] = func(entry, modlist)
+        for entry in [entry for struct in self.config.getchildren() for entry in struct.getchildren() \
+                      if self.handlesEntry(entry)]:
+            func = getattr(self, "Verify%s" % (entry.tag))
+            self.states[entry] = func(entry, modlist)
 
     def VerifySymLink(self, entry):

branches/refactor/client/src/lib/Client/__init__.py

@@ -2 +2 @@
 __revision__ = '$Revision$'
 
-__all__ = ["Proxy", "Toolset", "Debian", "Solaris", "Redhat", "Gentoo", "XML", "Tools"]
+__all__ = ["Frame", "Proxy", "Tools", 'XML"]