Hans Leidekker : msi: Don't schedule rollback actions during rollback.
Alexandre Julliard
julliard at winehq.org
Wed May 25 11:28:18 CDT 2011
Module: wine
Branch: master
Commit: 6c39fdf19a9bb8c8468d9b3f3dabfaa8cc967819
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c39fdf19a9bb8c8468d9b3f3dabfaa8cc967819
Author: Hans Leidekker <hans at codeweavers.com>
Date: Wed May 25 10:40:19 2011 +0200
msi: Don't schedule rollback actions during rollback.
---
dlls/msi/action.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 50e1e31..f38607f 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -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 );
}
More information about the wine-cvs
mailing list