ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Hans Leidekker 2011-06-07 10:34:35 +02:00 committed by Alexandre Julliard
parent 8aa8b9b654
commit c869192c92
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/msi/files.c
View File

@ -1271,9 +1271,6 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
VS_FIXEDFILEINFO *ver; VS_FIXEDFILEINFO *ver;
MSICOMPONENT *comp = file->Component; 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 ); comp->Action = msi_get_component_action( package, comp );
if (comp->Action != INSTALLSTATE_ABSENT || comp->Installed == INSTALLSTATE_SOURCE) if (comp->Action != INSTALLSTATE_ABSENT || comp->Installed == INSTALLSTATE_SOURCE)
continue; continue;
@ -1299,6 +1296,9 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
msi_free( ver ); 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) ); TRACE("removing %s\n", debugstr_w(file->File) );
SetFileAttributesW( file->TargetPath, FILE_ATTRIBUTE_NORMAL ); SetFileAttributesW( file->TargetPath, FILE_ATTRIBUTE_NORMAL );