aboutsummaryrefslogtreecommitdiff
path: root/src/engine/engine.mc
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-02-02 18:09:58 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-02-04 22:16:10 -0600
commitfd8c2b0899bfbce07386af245c04eb21dc01cbdf (patch)
tree33d928124b0028729916189ddb9f239a9574c75d /src/engine/engine.mc
parent39725a1a6d1c72a6748bd3c306af32bcae6dbf8f (diff)
downloadwix-fd8c2b0899bfbce07386af245c04eb21dc01cbdf.tar.gz
wix-fd8c2b0899bfbce07386af245c04eb21dc01cbdf.tar.bz2
wix-fd8c2b0899bfbce07386af245c04eb21dc01cbdf.zip
Update the logic for determining when the bundle should be registered.
The basic rule is that if a non-permanent package is present at the end of the chain, then the bundle should be registered. If no non-permanent packages are present at the end of the chain, then the bundle should not be registered. This required tracking what actually happened with each package during Apply. Include cache status in registration calculation. Include dependency ref-counting when determining whether the bundle should be registered.
Diffstat (limited to 'src/engine/engine.mc')
-rw-r--r--src/engine/engine.mc19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/engine/engine.mc b/src/engine/engine.mc
index d2135839..59a05676 100644
--- a/src/engine/engine.mc
+++ b/src/engine/engine.mc
@@ -188,7 +188,7 @@ MessageId=101
188Severity=Success 188Severity=Success
189SymbolicName=MSG_DETECTED_PACKAGE 189SymbolicName=MSG_DETECTED_PACKAGE
190Language=English 190Language=English
191Detected package: %1!ls!, state: %2!hs!, cached: %3!hs! 191Detected package: %1!ls!, state: %2!hs!, cached: %3!hs!, install registration state: %4!hs!, cache registration state: %5!hs!
192. 192.
193 193
194MessageId=102 194MessageId=102
@@ -300,7 +300,7 @@ MessageId=201
300Severity=Success 300Severity=Success
301SymbolicName=MSG_PLANNED_PACKAGE 301SymbolicName=MSG_PLANNED_PACKAGE
302Language=English 302Language=English
303Planned package: %1!ls!, state: %2!hs!, default requested: %3!hs!, ba requested: %4!hs!, execute: %5!hs!, rollback: %6!hs!, cache: %7!hs!, uncache: %8!hs!, dependency: %9!hs! 303Planned package: %1!ls!, state: %2!hs!, default requested: %3!hs!, ba requested: %4!hs!, execute: %5!hs!, rollback: %6!hs!, cache: %7!hs!, uncache: %8!hs!, dependency: %9!hs!, expected install registration state: %10!hs!, expected cache registration state: %11!hs!
304. 304.
305 305
306MessageId=202 306MessageId=202
@@ -829,6 +829,21 @@ Language=English
829Session end, registration key: %1!ls!, resume: %2!hs!, restart: %3!hs!, disable resume: %4!hs! 829Session end, registration key: %1!ls!, resume: %2!hs!, restart: %3!hs!, disable resume: %4!hs!
830. 830.
831 831
832MessageId=373
833Severity=Success
834SymbolicName=MSG_POST_APPLY_CALCULATE_REGISTRATION
835Language=English
836Calculating whether to keep registration
837.
838
839
840MessageId=374
841Severity=Success
842SymbolicName=MSG_POST_APPLY_PACKAGE
843Language=English
844 package: %1!ls!, install registration state: %2!hs!, cache registration state: %3!hs!
845.
846
832MessageId=380 847MessageId=380
833Severity=Warning 848Severity=Warning
834SymbolicName=MSG_APPLY_SKIPPED 849SymbolicName=MSG_APPLY_SKIPPED