diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2018-09-09 15:15:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-09 15:15:17 -0500 |
| commit | 954b7179a06c1933ae783b602bc29caa0370aec0 (patch) | |
| tree | 98584897bded70665994d9fe68f5e0f1bd24dfb4 /src/WixToolset.Core | |
| parent | 38b6fe65e36ed9442e3fc714dea1793d457f0b20 (diff) | |
| parent | a2614e6e11108abba52b9eca8f460d9ab57513f5 (diff) | |
| download | wix-954b7179a06c1933ae783b602bc29caa0370aec0.tar.gz wix-954b7179a06c1933ae783b602bc29caa0370aec0.tar.bz2 wix-954b7179a06c1933ae783b602bc29caa0370aec0.zip | |
Merge pull request #2 from wixtoolset/bob/5853-variable-redefinition
Warn on variable redefinition only when the values are different.
Diffstat (limited to 'src/WixToolset.Core')
| -rw-r--r-- | src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs index 0e4bba51..562f094f 100644 --- a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs | |||
| @@ -45,7 +45,7 @@ namespace WixToolset.Core.ExtensibilityServices | |||
| 45 | } | 45 | } |
| 46 | else | 46 | else |
| 47 | { | 47 | { |
| 48 | if (showWarning) | 48 | if (showWarning && value != currentValue) |
| 49 | { | 49 | { |
| 50 | this.Messaging.Write(WarningMessages.VariableDeclarationCollision(context.CurrentSourceLineNumber, name, value, currentValue)); | 50 | this.Messaging.Write(WarningMessages.VariableDeclarationCollision(context.CurrentSourceLineNumber, name, value, currentValue)); |
| 51 | } | 51 | } |