summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/models.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-18 12:49:40 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-18 12:49:40 -0500
commit1b001ee4a4d5cacab04c1e99ad4cc4ce4ca93894 (patch)
tree474ebe16d5bc7724fc4224a7b5068639b27b2027 /src/lib/Bcfg2/Server/models.py
parent7161b78b261cdbd959bf6f42d0780ceb78bf2e64 (diff)
downloadbcfg2-1b001ee4a4d5cacab04c1e99ad4cc4ce4ca93894.tar.gz
bcfg2-1b001ee4a4d5cacab04c1e99ad4cc4ce4ca93894.tar.bz2
bcfg2-1b001ee4a4d5cacab04c1e99ad4cc4ce4ca93894.zip
fixed detection of default plugin list when loading django ORM models
Diffstat (limited to 'src/lib/Bcfg2/Server/models.py')
-rw-r--r--src/lib/Bcfg2/Server/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/models.py b/src/lib/Bcfg2/Server/models.py
index 11d85c248..370854881 100644
--- a/src/lib/Bcfg2/Server/models.py
+++ b/src/lib/Bcfg2/Server/models.py
@@ -58,7 +58,7 @@ def load_models(plugins=None, cfile='/etc/bcfg2.conf', quiet=True):
err = sys.exc_info()[1]
mod = __import__(plugin)
except: # pylint: disable=W0702
- if plugins != Bcfg2.Server.Plugins.__all__:
+ if plugins != plugin_opt.default:
# only produce errors if the default plugin list
# was not used -- i.e., if the config file was set
# up. don't produce errors when trying to load