diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-27 10:43:19 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-27 10:43:25 -0400 |
| commit | 63567693a838316e1323eb96c8e6f698fdf63418 (patch) | |
| tree | a70b049c96cef28d6922025fc15c80e965fa5185 /src | |
| parent | af363ce540bd2510e06d55b53b39010df69037de (diff) | |
| download | bcfg2-63567693a838316e1323eb96c8e6f698fdf63418.tar.gz bcfg2-63567693a838316e1323eb96c8e6f698fdf63418.tar.bz2 bcfg2-63567693a838316e1323eb96c8e6f698fdf63418.zip | |
fixed import/usage of MetadataConsistencyError
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Bundle.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Client.py | 2 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-info | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Bundle.py b/src/lib/Bcfg2/Server/Admin/Bundle.py index e5e4eadf3..dbadaa3af 100644 --- a/src/lib/Bcfg2/Server/Admin/Bundle.py +++ b/src/lib/Bcfg2/Server/Admin/Bundle.py @@ -4,7 +4,7 @@ import sys import re import Bcfg2.Server.Admin import Bcfg2.Options -from Bcfg2.Server.Plugins.Metadata import MetadataConsistencyError +from Bcfg2.Server.Plugin import MetadataConsistencyError class Bundle(Bcfg2.Server.Admin.MetadataCore): diff --git a/src/lib/Bcfg2/Server/Admin/Client.py b/src/lib/Bcfg2/Server/Admin/Client.py index 34dfd7550..902c71c34 100644 --- a/src/lib/Bcfg2/Server/Admin/Client.py +++ b/src/lib/Bcfg2/Server/Admin/Client.py @@ -1,6 +1,6 @@ import lxml.etree import Bcfg2.Server.Admin -from Bcfg2.Server.Plugins.Metadata import MetadataConsistencyError +from Bcfg2.Server.Plugin import MetadataConsistencyError class Client(Bcfg2.Server.Admin.MetadataCore): diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 7cc361a1c..9fb183776 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -26,7 +26,6 @@ except: import Bcfg2.Logger import Bcfg2.Options import Bcfg2.Server.Core -import Bcfg2.Server.Plugins.Metadata import Bcfg2.Server.Plugin try: @@ -483,7 +482,7 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.BaseCore): client = args.split()[0] try: meta = self.build_metadata(client) - except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError: + except Bcfg2.Server.Plugin.MetadataConsistencyError: print("Unable to find metadata for host %s" % client) return structures = self.GetStructures(meta) @@ -587,7 +586,7 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.BaseCore): def do_cfgdebug(self, args): try: meta = self.build_metadata(args) - except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError: + except Bcfg2.Server.Plugin.MetadataConsistencyError: print("Unable to find metadata for host %s" % args) return structures = self.GetStructures(meta) @@ -641,7 +640,7 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.BaseCore): return try: metadata = self.build_metadata(args) - except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError: + except Bcfg2.Server.Plugin.MetadataConsistencyError: print("Unable to build metadata for host %s" % args) return collection = self.plugins['Packages']._get_collection(metadata) |