diff options
| author | Michael Fenn <fennm@deshawresearch.com> | 2013-10-10 14:13:26 -0400 |
|---|---|---|
| committer | Michael Fenn <fennm@deshawresearch.com> | 2013-10-10 14:13:26 -0400 |
| commit | 9871be0932869f35f33d3da22dae8db474e31cdd (patch) | |
| tree | c14632278e11aabfbf6e213bfd8e951e78933afd /src/lib/Bcfg2/Server/Core.py | |
| parent | f813f86f8ac2bc7b55f4eb6a0d936f1ce4f68ba7 (diff) | |
| parent | 3a5eec174af0b9907b29fdfd3eb1e4fd7677beeb (diff) | |
| download | bcfg2-9871be0932869f35f33d3da22dae8db474e31cdd.tar.gz bcfg2-9871be0932869f35f33d3da22dae8db474e31cdd.tar.bz2 bcfg2-9871be0932869f35f33d3da22dae8db474e31cdd.zip | |
Merge remote-tracking branch 'upstream/maint' into reporting-thread-each-data-import
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 271fb8237..5ec1b5bce 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -648,10 +648,10 @@ class BaseCore(object): del entry.attrib['realname'] return ret except: - entry.set('name', oldname) self.logger.error("Failed binding entry %s:%s with altsrc %s" % - (entry.tag, entry.get('name'), - entry.get('altsrc'))) + (entry.tag, entry.get('realname'), + entry.get('name'))) + entry.set('name', oldname) self.logger.error("Falling back to %s:%s" % (entry.tag, entry.get('name'))) |