diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-03-13 23:45:32 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-03-14 14:53:29 -0500 |
commit | 4cd1c4e06145434ca940ac828772dc47b9d9738e (patch) | |
tree | a754d685039173c63303dc6d0d8b1a2bf3ab506b /src/libs/dutil/WixToolset.DUtil/butil.cpp | |
parent | 89adb2e3cc232b11b28e5bdeccb0c522c8124a29 (diff) | |
download | wix-4cd1c4e06145434ca940ac828772dc47b9d9738e.tar.gz wix-4cd1c4e06145434ca940ac828772dc47b9d9738e.tar.bz2 wix-4cd1c4e06145434ca940ac828772dc47b9d9738e.zip |
Allow the BA to override the bundle relation type during plan.
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/butil.cpp')
-rw-r--r-- | src/libs/dutil/WixToolset.DUtil/butil.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/butil.cpp b/src/libs/dutil/WixToolset.DUtil/butil.cpp index ac322ae7..175903ad 100644 --- a/src/libs/dutil/WixToolset.DUtil/butil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/butil.cpp | |||
@@ -559,7 +559,7 @@ static HRESULT DetermineRelationType( | |||
559 | { | 559 | { |
560 | ExitOnFailure(hr, "Failed to do array search for addon code match."); | 560 | ExitOnFailure(hr, "Failed to do array search for addon code match."); |
561 | 561 | ||
562 | *pRelationType = BUNDLE_RELATION_DEPENDENT; | 562 | *pRelationType = BUNDLE_RELATION_DEPENDENT_ADDON; |
563 | ExitFunction(); | 563 | ExitFunction(); |
564 | } | 564 | } |
565 | 565 | ||
@@ -571,9 +571,9 @@ static HRESULT DetermineRelationType( | |||
571 | } | 571 | } |
572 | else | 572 | else |
573 | { | 573 | { |
574 | ExitOnFailure(hr, "Failed to do array search for addon code match."); | 574 | ExitOnFailure(hr, "Failed to do array search for patch code match."); |
575 | 575 | ||
576 | *pRelationType = BUNDLE_RELATION_DEPENDENT; | 576 | *pRelationType = BUNDLE_RELATION_DEPENDENT_PATCH; |
577 | ExitFunction(); | 577 | ExitFunction(); |
578 | } | 578 | } |
579 | 579 | ||
@@ -690,7 +690,7 @@ static HRESULT DetermineRelationType( | |||
690 | { | 690 | { |
691 | ExitOnFailure(hr, "Failed to do array search for addon code match."); | 691 | ExitOnFailure(hr, "Failed to do array search for addon code match."); |
692 | 692 | ||
693 | *pRelationType = BUNDLE_RELATION_DEPENDENT; | 693 | *pRelationType = BUNDLE_RELATION_DEPENDENT_ADDON; |
694 | ExitFunction(); | 694 | ExitFunction(); |
695 | } | 695 | } |
696 | 696 | ||
@@ -702,9 +702,9 @@ static HRESULT DetermineRelationType( | |||
702 | } | 702 | } |
703 | else | 703 | else |
704 | { | 704 | { |
705 | ExitOnFailure(hr, "Failed to do array search for addon code match."); | 705 | ExitOnFailure(hr, "Failed to do array search for patch code match."); |
706 | 706 | ||
707 | *pRelationType = BUNDLE_RELATION_DEPENDENT; | 707 | *pRelationType = BUNDLE_RELATION_DEPENDENT_PATCH; |
708 | ExitFunction(); | 708 | ExitFunction(); |
709 | } | 709 | } |
710 | 710 | ||