From c869192c92f644396af49eb655c94d471df50a66 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Tue, 7 Jun 2011 10:34:35 +0200 Subject: [PATCH] msi: Print a warning instead of an error if we're going to remove an installed file. Removing an installed file is normal as part of a rollback. --- dlls/msi/files.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 2ea119e7d5b..af84e9b5963 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 );