[msitools: 1/2] wixl: Make the ServiceControl attributes Remove/Start/Stop optional.
- From: Marc-André Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [msitools: 1/2] wixl: Make the ServiceControl attributes Remove/Start/Stop optional.
- Date: Sun, 4 Oct 2020 16:36:32 +0000 (UTC)
commit 619d9a9fdd5a6951f1f9f99bceded133256769cc
Author: Brendon Jones <brendonj waikato ac nz>
Date: Wed Sep 30 10:10:30 2020 +1300
wixl: Make the ServiceControl attributes Remove/Start/Stop optional.
tools/wixl/builder.vala | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/tools/wixl/builder.vala b/tools/wixl/builder.vala
index 63d3099..cccc163 100644
--- a/tools/wixl/builder.vala
+++ b/tools/wixl/builder.vala
@@ -913,9 +913,12 @@ namespace Wixl {
if (service_control.Wait != null)
Wait = parse_yesno(service_control.Wait);
- event |= install_mode_to_event(service_control.Start, ServiceControlEvent.INSTALL_START,
ServiceControlEvent.UNINSTALL_START);
- event |= install_mode_to_event(service_control.Stop, ServiceControlEvent.INSTALL_STOP,
ServiceControlEvent.UNINSTALL_STOP);
- event |= install_mode_to_event(service_control.Remove, ServiceControlEvent.INSTALL_DELETE,
ServiceControlEvent.UNINSTALL_DELETE);
+ if (service_control.Start != null)
+ event |= install_mode_to_event(service_control.Start, ServiceControlEvent.INSTALL_START,
ServiceControlEvent.UNINSTALL_START);
+ if (service_control.Stop != null)
+ event |= install_mode_to_event(service_control.Stop, ServiceControlEvent.INSTALL_STOP,
ServiceControlEvent.UNINSTALL_STOP);
+ if (service_control.Remove != null)
+ event |= install_mode_to_event(service_control.Remove, ServiceControlEvent.INSTALL_DELETE,
ServiceControlEvent.UNINSTALL_DELETE);
db.table_service_control.add(service_control.Id, service_control.Name, event, ServiceArguments,
Wait, comp.Id);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]