No longer store . in map

autopkg · Sep 21, 2023 · d3c18d4 · d3c18d4
1 parent bd8ef7b
commit d3c18d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Code/autopkg b/Code/autopkg
@@ -196,7 +196,7 @@ def locate_recipe(
         recipe_file = find_recipe(name, skip_overrides)
         if not recipe_file:
             # If we still didn't find it in the map, try rebuilding the map with current dirs
-            log("Rebuilding recipe map with cur dirs")
+            log("Rebuilding recipe map with current working directories...")
             calculate_recipe_map(skip_cwd=False)
             recipe_file = find_recipe(name, skip_overrides)
 

diff --git a/Code/autopkglib/__init__.py b/Code/autopkglib/__init__.py
@@ -329,7 +329,6 @@ def calculate_recipe_map(
         elif search_dir == ".":
             # if we're not skipping cwd, we want to add it to the map
             search_dir = os.path.abspath(".")
-            log("Using . in the map temporarily")
         globalRecipeMap["identifiers"].update(
             map_key_to_paths("identifiers", search_dir)
         )
@@ -340,7 +339,7 @@ def calculate_recipe_map(
         globalRecipeMap["overrides-identifiers"].update(
             map_key_to_paths("overrides-identifiers", override)
         )
-    if not extra_search_dirs or not extra_override_dirs or not skip_cwd:
+    if skip_cwd and (not extra_search_dirs or not extra_override_dirs):
         # Don't store the extra stuff in the cache; they're intended to be temporary
         write_recipe_map_to_disk()