Merge pull request #2951 from nickanderson/CFE-4442/3.21.x

CFE-4442: Clarified need for namespace to be specified when defining a custom policy update bundle (3.21)

MPF.md

@@ -149,12 +149,16 @@ Override this bundle by setting `def.mpf_update_policy_bundle` via augments:
 
 ```json
 {
-  "vars": {
-    "mpf_update_policy_bundle": "MyCustomPolicyUpdateBundle"
+  "variables": {
+    "default:def.mpf_update_policy_bundle": {
+      "value": "default:MyCustomPolicyUpdateBundle"
+    }
   }
 }
 ```
 
+**NOTE:** Be sure to specify the namespace the bundle is in, for example, `default`.
+
 **History:**
 
 * Introduced in 3.12.0

cfe_internal/update/update_policy.cf

@@ -42,7 +42,7 @@ bundle agent cfe_internal_update_policy
 
       # Look for a bundle that matches what the user wants
       "found_matching_user_specified_bundle"
-        slist => bundlesmatching( "$(def.mpf_update_policy_bundle)" );
+        slist => bundlesmatching( "^$(def.mpf_update_policy_bundle)$" );
 
   methods:
 
@@ -71,18 +71,16 @@ bundle agent cfe_internal_update_policy
     inform_mode|verbose_mode|DEBUG|DEBUG_cfe_internal_update_policy::
       # Report a human readable way to understand the policy behavior
 
-      "Found user specified update bundle."
-        if => "have_user_specified_update_bundle";
-
       "User specified update bundle: $(def.mpf_update_policy_bundle)"
         if => "have_user_specified_update_bundle";
 
       "User specified update bundle MISSING! Falling back to $(default_policy_update_bundle)."
         if => and( "have_user_specified_update_bundle",
-                   "missing_user_specified_update_bundle"
-                  );
-
-
+                   "missing_user_specified_update_bundle" );
+    any::
+      "WARNING User specified update bundle '$(def.mpf_update_policy_bundle)' does not specify a namespace. Please specify a namespace, e.g. 'default:$(def.mpf_update_policy_bundle)'."
+        if => and( not(regcmp( ".*:.*", $(def.mpf_update_policy_bundle) ) ),
+                   "have_user_specified_update_bundle" );
 }
 
 bundle agent cfe_internal_setup_python_symlink(symlink_path)