Merge branch 'development03-bugfix-pkg_resources' of https://github.c…

…om/fsck-block/ahoy into fsck-block-development03-bugfix-pkg_resources
lumapu · Oct 3, 2024 · 2c27bbe · 2c27bbe
2 parents e601bfe + ac88109
commit 2c27bbe
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/scripts/auto_firmware_version.py b/scripts/auto_firmware_version.py
@@ -2,16 +2,14 @@
 #
 # Copyright (C) 2022 Thomas Basler and others
 #
-import pkg_resources
 
 Import("env")
 
-required_pkgs = {'dulwich'}
-installed_pkgs = {pkg.key for pkg in pkg_resources.working_set}
-missing_pkgs = required_pkgs - installed_pkgs
-
-if missing_pkgs:
+try:
+    from dulwich import porcelain
+except ModuleNotFoundError:
     env.Execute('"$PYTHONEXE" -m pip install dulwich')
+    from dulwich import porcelain
 
 from dulwich import porcelain