From 5d6046bee5021052da4a666c1e2ceeb0f16af349 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 16 Apr 2021 10:20:41 -0500
Subject: Replace OnResolveSource with OnCacheAcquireResolving

Inactivate the engine during OnCacheAcquireBegin and Complete to allow setting the source from there.

Fixes #3640
Contributes to #5253
---
 src/engine/engine.mc | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'src/engine/engine.mc')

diff --git a/src/engine/engine.mc b/src/engine/engine.mc
index c8b46806..f03bc1ea 100644
--- a/src/engine/engine.mc
+++ b/src/engine/engine.mc
@@ -151,9 +151,9 @@ Bundle global condition check didn't succeed - aborting without loading applicat
 
 MessageId=54
 Severity=Error
-SymbolicName=MSG_PAYLOAD_FILE_NOT_PRESENT
+SymbolicName=MSG_RESOLVE_SOURCE_FAILED
 Language=English
-Failed to resolve source for file: %2!ls!, error: %1!ls!.
+Failed to resolve source for payload: %2!ls!, package: %3!ls!, container: %4!ls!, error: %1!ls!.
 .
 
 MessageId=55
@@ -724,34 +724,6 @@ Language=English
 Acquiring package: %1!ls!, payload: %2!ls!, %3!hs! from: %4!ls!
 .
 
-MessageId=340
-Severity=Warning
-SymbolicName=MSG_PROMPT_BUNDLE_PAYLOAD_SOURCE
-Language=English
-Prompt for source of bundle payload: %2!ls!, path: %3!ls!
-.
-
-MessageId=341
-Severity=Warning
-SymbolicName=MSG_PROMPT_CONTAINER_SOURCE
-Language=English
-Prompt for source of container: %1!ls!, path: %3!ls!
-.
-
-MessageId=342
-Severity=Warning
-SymbolicName=MSG_PROMPT_CONTAINER_PAYLOAD_SOURCE
-Language=English
-Prompt for source of container: %1!ls!, payload: %2!ls!, path: %3!ls!
-.
-
-MessageId=343
-Severity=Warning
-SymbolicName=MSG_PROMPT_PACKAGE_PAYLOAD_SOURCE
-Language=English
-Prompt for source of package: %1!ls!, payload: %2!ls!, path: %3!ls!
-.
-
 MessageId=348
 Severity=Warning
 SymbolicName=MSG_APPLY_RETRYING_PACKAGE
-- 
cgit v1.2.3-55-g6feb