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

msi: Don't schedule rollback actions during rollback.

This commit is contained in:
Hans Leidekker 2011-05-25 10:40:19 +02:00 committed by Alexandre Julliard
parent 3ce11c7cc2
commit 6c39fdf19a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msi/action.c
View File

@ -7246,8 +7246,7 @@ static BOOL ACTION_HandleStandardAction( MSIPACKAGE *package, LPCWSTR action, UI
*rc = StandardActions[i].handler( package );
ui_actioninfo( package, action, FALSE, *rc );
if (StandardActions[i].action_rollback &&
!msi_get_property_int( package->db, szRollbackDisabled, 0 ))
if (StandardActions[i].action_rollback && !package->need_rollback)
{
TRACE("scheduling rollback action\n");
msi_schedule_action( package, ROLLBACK_SCRIPT, StandardActions[i].action_rollback );
@ -7484,7 +7483,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
if (package->need_rollback)
{
WARN("installation failed, running rollback script\n");
msi_set_property( package->db, szRollbackDisabled, NULL );
execute_script( package, ROLLBACK_SCRIPT );
}