diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-08-01 11:39:35 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-08-01 11:39:35 +0000 |
| commit | 4dfda226b46f9d7dc3eec48b9d4406b4ea033c35 (patch) | |
| tree | 421805dd1d17143734882de583f9c8ba6d6ecfaf /cpp/src/IceGrid/DescriptorHelper.cpp | |
| parent | another enum fix (diff) | |
| download | ice-4dfda226b46f9d7dc3eec48b9d4406b4ea033c35.tar.bz2 ice-4dfda226b46f9d7dc3eec48b9d4406b4ea033c35.tar.xz ice-4dfda226b46f9d7dc3eec48b9d4406b4ea033c35.zip | |
Fixed bug where variables weren't substituted in distribution descriptors.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 4055a580ff9..0a23a5760f3 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -421,7 +421,7 @@ Resolver::operator()(const DistributionDescriptor& desc) const DistributionDescriptor result; result.icepatch = operator()(desc.icepatch, "IcePatch2 server proxy"); result.directories = operator()(desc.directories, "distribution source directory"); - return desc; + return result; } PropertyDescriptorSeq @@ -2341,6 +2341,7 @@ ApplicationUpdateDescriptor ApplicationHelper::diff(const ApplicationHelper& helper) const { ApplicationUpdateDescriptor updt; + assert(helper._def.name == _def.name); updt.name = _def.name; if(_def.description != helper._def.description) |