mirror of
https://git.datalinker.icu/ltdrdata/ComfyUI-Manager
synced 2025-12-13 16:14:26 +08:00
fix pattern (#1439)
This commit is contained in:
parent
9578ce0820
commit
4ad1c8a238
@ -233,7 +233,7 @@ def remap_pip_package(pkg):
|
|||||||
def is_blacklisted(name):
|
def is_blacklisted(name):
|
||||||
name = name.strip()
|
name = name.strip()
|
||||||
|
|
||||||
pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)'
|
pattern = r'([^<>!~=]+)([<>!~=]=?)([^ ]*)'
|
||||||
match = re.search(pattern, name)
|
match = re.search(pattern, name)
|
||||||
|
|
||||||
if match:
|
if match:
|
||||||
@ -248,7 +248,7 @@ def is_blacklisted(name):
|
|||||||
if match is None:
|
if match is None:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
return True
|
return True
|
||||||
elif match.group(2) in ['<=', '==', '<']:
|
elif match.group(2) in ['<=', '==', '<', '~=']:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
||||||
return True
|
return True
|
||||||
@ -262,7 +262,7 @@ def is_installed(name):
|
|||||||
if name.startswith('#'):
|
if name.startswith('#'):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)'
|
pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)'
|
||||||
match = re.search(pattern, name)
|
match = re.search(pattern, name)
|
||||||
|
|
||||||
if match:
|
if match:
|
||||||
|
|||||||
@ -413,7 +413,7 @@ def is_installed(name):
|
|||||||
if name.startswith('#'):
|
if name.startswith('#'):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)'
|
pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)'
|
||||||
match = re.search(pattern, name)
|
match = re.search(pattern, name)
|
||||||
|
|
||||||
if match:
|
if match:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user