Merge branch 'main' into feat/cnr

glob/manager_core.py

@@ -31,7 +31,7 @@ import cnr_utils
 from manager_util import *
 
 
-version_code = [2, 48, 7]
+version_code = [2, 49]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 
@@ -176,6 +176,9 @@ def is_blacklisted(name):
     if match:
         name = match.group(1)
 
+    if name in cm_global.pip_blacklist:
+        return True
+
     if name in cm_global.pip_downgrade_blacklist:
         pips = get_installed_packages()
 
@@ -202,6 +205,9 @@ def is_installed(name):
     if match:
         name = match.group(1)
 
+    if name in cm_global.pip_blacklist:
+        return True
+
     if name in cm_global.pip_downgrade_blacklist:
         pips = get_installed_packages()
 

glob/manager_util.py

@@ -17,7 +17,7 @@ cache_dir = os.path.join(comfyui_manager_path, '.cache')
 # try:
 #     from distutils.version import StrictVersion
 # except:
-print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
+#     print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
 class StrictVersion:
     def __init__(self, version_string):
         self.version_string = version_string