[05/10] msi: Print a warning instead of an error if we're going to remove an installed file.

Hans Leidekker hans at codeweavers.com
Tue Jun 7 03:34:35 CDT 2011


Removing an installed file is normal as part of a rollback.
---
 dlls/msi/files.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 2ea119e..af84e9b 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -1271,9 +1271,6 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
         VS_FIXEDFILEINFO *ver;
         MSICOMPONENT *comp = file->Component;
 
-        if ( file->state == msifs_installed )
-            ERR("removing installed file %s\n", debugstr_w(file->TargetPath));
-
         comp->Action = msi_get_component_action( package, comp );
         if (comp->Action != INSTALLSTATE_ABSENT || comp->Installed == INSTALLSTATE_SOURCE)
             continue;
@@ -1299,6 +1296,9 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
             msi_free( ver );
         }
 
+        if (file->state == msifs_installed)
+            WARN("removing installed file %s\n", debugstr_w(file->TargetPath));
+
         TRACE("removing %s\n", debugstr_w(file->File) );
 
         SetFileAttributesW( file->TargetPath, FILE_ATTRIBUTE_NORMAL );
-- 
1.7.4.1







More information about the wine-patches mailing list