diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-17 08:04:28 -0700 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-17 08:04:28 -0700 |
| commit | 4535f5a5ddfe6993ac4d3e7e4ecd63b216649dad (patch) | |
| tree | 886d4d1e5e06c0b2281b4347b1b5f0f0a46aef27 /src/lib/Bcfg2/Server/Plugins/Probes.py | |
| parent | 3182474429ae251603e46f6ac32e46cde87e92ac (diff) | |
| parent | 6ce11c9e50cba0303aea06672388d3af452fa468 (diff) | |
| download | bcfg2-4535f5a5ddfe6993ac4d3e7e4ecd63b216649dad.tar.gz bcfg2-4535f5a5ddfe6993ac4d3e7e4ecd63b216649dad.tar.bz2 bcfg2-4535f5a5ddfe6993ac4d3e7e4ecd63b216649dad.zip | |
Merge pull request #96 from kincl/jasons-hacking
Svn: Adding config options for specifying a user and password for subversion and to trust server SSL certificates
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index 8937e4740..0974184b4 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -12,6 +12,7 @@ import Bcfg2.Server.Plugin try: from django.db import models + from django.core.exceptions import MultipleObjectsReturned HAS_DJANGO = True class ProbesDataModel(models.Model, @@ -255,7 +256,7 @@ class Probes(Bcfg2.Server.Plugin.Probing, ProbesGroupsModel.objects.get_or_create( hostname=client.hostname, group=group) - except ProbesGroupsModel.MultipleObjectsReturned: + except MultipleObjectsReturned: ProbesGroupsModel.objects.filter(hostname=client.hostname, group=group).delete() ProbesGroupsModel.objects.get_or_create( |