diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-05 15:10:20 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-05 15:10:20 -0400 |
| commit | 535506260692f00b3d073d1efc73d2d565792e82 (patch) | |
| tree | 7ab02a592929cfbd6e4e4ec28a35f216a7f7bcee /src/lib/Bcfg2/Server/Core.py | |
| parent | f8416134cc80d704e6f139aa1ab1ce47e00e4f7f (diff) | |
| download | bcfg2-535506260692f00b3d073d1efc73d2d565792e82.tar.gz bcfg2-535506260692f00b3d073d1efc73d2d565792e82.tar.bz2 bcfg2-535506260692f00b3d073d1efc73d2d565792e82.zip | |
Core: avoid importing Metadata before Django has been configured
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 5482e32fe..271fb8237 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -22,7 +22,6 @@ from Bcfg2.Compat import xmlrpclib # pylint: disable=W0622 from Bcfg2.Server.Plugin.exceptions import * # pylint: disable=W0401,W0614 from Bcfg2.Server.Plugin.interfaces import * # pylint: disable=W0401,W0614 from Bcfg2.Server.Plugin import track_statistics -from Bcfg2.Server.Plugins.Metadata import MetadataGroup try: import psyco @@ -890,7 +889,7 @@ class BaseCore(object): groups = conn.get_additional_groups(imd) groupnames = [] for group in groups: - if isinstance(group, MetadataGroup): + if hasattr(group, "name"): groupname = group.name if groupname in self._dynamic_groups: if self._dynamic_groups[groupname] == conn.name: |