diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Client/Tools/POSIX.py | 11 | ||||
-rw-r--r-- | src/lib/Server/Plugins/POSIXCompat.py (renamed from src/lib/Server/Plugins/Compat.py) | 6 | ||||
-rw-r--r-- | src/lib/Server/Plugins/__init__.py | 34 |
3 files changed, 37 insertions, 14 deletions
diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py index 610305a09..81471f910 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Client/Tools/POSIX.py @@ -79,12 +79,11 @@ def isString(strng): class POSIX(Bcfg2.Client.Tools.Tool): '''POSIX File support code''' name = 'POSIX' - __handles__ = [('ConfigFile', None), ('ConfigFile', 'Compat'), - ('Directory', None), ('Path', 'ConfigFile'), - ('Path', 'Device'), ('Path', 'Directory'), - ('Path', 'HardLink'), ('Path', 'Perms'), - ('Path', 'SymLink'), ('Permissions', None), - ('SymLink', None)] + __handles__ = [('ConfigFile', None), ('Directory', None), + ('Path', 'ConfigFile'), ('Path', 'Device'), + ('Path', 'Directory'), ('Path', 'HardLink'), + ('Path', 'Perms'), ('Path', 'SymLink'), + ('Permissions', None), ('SymLink', None)] __req__ = {'ConfigFile': ['name', 'owner', 'group', 'perms'], 'Directory': ['name', 'owner', 'group', 'perms'], 'Path': ['name', 'type'], diff --git a/src/lib/Server/Plugins/Compat.py b/src/lib/Server/Plugins/POSIXCompat.py index bf0ea6bc7..9964bf1f5 100644 --- a/src/lib/Server/Plugins/Compat.py +++ b/src/lib/Server/Plugins/POSIXCompat.py @@ -14,9 +14,9 @@ import Bcfg2.Server.Plugin # 'permissions': 'Permissions', # 'symlink': 'SymLink'} -class Compat(Bcfg2.Server.Plugin.Plugin, +class POSIXCompat(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.GoalValidator): - name = 'Compat' + name = 'POSIXCompat' __version__ = '$Id$' __author__ = 'bcfg-dev@mcs.anl.gov' @@ -33,5 +33,5 @@ class Compat(Bcfg2.Server.Plugin.Plugin, del entry.attrib['type'] # FIXME: use another attribute? old clients only # know about type=None - #entry.set('type', 'Compat') + #entry.set('type', 'POSIXCompat') goal.replace(oldentry, entry) diff --git a/src/lib/Server/Plugins/__init__.py b/src/lib/Server/Plugins/__init__.py index 88f84e536..127035919 100644 --- a/src/lib/Server/Plugins/__init__.py +++ b/src/lib/Server/Plugins/__init__.py @@ -1,8 +1,32 @@ '''imports for Bcfg2.Server.Plugins''' __revision__ = '$Revision$' -__all__ = ['Account', 'Base', 'Bundler', 'Cfg', 'Compat', 'Decisions', - 'GBundler', 'Git', 'Hostbase', 'Metadata', 'NagiosGen', 'Packages', - 'Properties', 'Probes', 'Pkgmgr', 'Rules', 'SSHbase', 'Snapshots', - 'Statistics', 'Svcmgr', 'Svn', 'TCheetah', 'Trigger', 'SGenshi', - 'TGenshi', 'GroupPatterns', 'Ohai'] +__all__ = [ + 'Account', + 'Base', + 'Bundler', + 'Cfg', + 'Decisions', + 'GBundler', + 'Git', + 'GroupPatterns', + 'Hostbase', + 'Metadata', + 'NagiosGen', + 'Ohai', + 'Packages', + 'Properties', + 'Probes', + 'Pkgmgr', + 'POSIXCompat', + 'Rules', + 'SSHbase', + 'Snapshots', + 'Statistics', + 'Svcmgr', + 'Svn', + 'TCheetah', + 'Trigger', + 'SGenshi', + 'TGenshi', + ] |