diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-07-07 12:39:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-07-07 12:39:43 +0300 |
| commit | 57fea53615b9996b79a2945c4d5a7442ccb24d85 (patch) | |
| tree | 3e3b13b1ae70cb80b5d4f14907e70e5c771a7026 /win | |
| parent | 7fee164faf8fce7be4ebe322d2178efd3d075eae (diff) | |
| parent | 9e53a6bdfddaf0288ed34be272570cd7a304d01e (diff) | |
| download | mariadb-git-57fea53615b9996b79a2945c4d5a7442ccb24d85.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/ca/CustomAction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp index 9a174b8529e..9281ce27d34 100644 --- a/win/packaging/ca/CustomAction.cpp +++ b/win/packaging/ca/CustomAction.cpp @@ -180,7 +180,7 @@ extern "C" UINT __stdcall CheckDirectoryEmpty(MSIHANDLE hInstall, empty= true; for(;;) { - if (wcscmp(data.cFileName, L".") || wcscmp(data.cFileName, L"..")) + if (wcscmp(data.cFileName, L".") && wcscmp(data.cFileName, L"..")) { empty= false; break; |