Merge branch 'dev' of https://github.com/autopkg/autopkg into dev_rec…

…ipe_map
autopkg · Jul 25, 2023 · ac7d542 · ac7d542
2 parents 75fa5dd + e4617e3
commit ac7d542
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Code/autopkg b/Code/autopkg
@@ -40,7 +40,6 @@ from autopkglib import (
     AutoPackager,
     AutoPackagerError,
     PreferenceError,
-    globalRecipeMap,
     calculate_recipe_map,
     core_processor_names,
     extract_processor_name_with_recipe_identifier,
@@ -50,10 +49,11 @@ from autopkglib import (
     get_all_prefs,
     get_autopkg_version,
     get_identifier,
-    get_search_dirs,
     get_override_dirs,
     get_pref,
     get_processor,
+    get_search_dirs,
+    globalRecipeMap,
     is_mac,
     log,
     log_err,
@@ -63,10 +63,10 @@ from autopkglib import (
     recipe_from_file,
     remove_recipe_extension,
     set_pref,
-    version_equal_or_greater,
-    valid_recipe_file,
-    valid_recipe_dict,
     valid_override_dict,
+    valid_recipe_dict,
+    valid_recipe_file,
+    version_equal_or_greater,
 )
 from autopkglib.autopkgyaml import autopkg_str_representer
 from autopkglib.github import GitHubSession, print_gh_search_results

diff --git a/Code/autopkglib/__init__.py b/Code/autopkglib/__init__.py
@@ -498,7 +498,7 @@ def get_override_dirs():
     return dirs or default
 
 
-def calculate_recipe_map(extra_search_dirs = None, extra_override_dirs = None):
+def calculate_recipe_map(extra_search_dirs=None, extra_override_dirs=None):
     """Recalculate the entire recipe map"""
     global globalRecipeMap
     globalRecipeMap = {"identifiers": {}, "shortnames": {}, "overrides": {}}