Commit 33bb282e authored by Klaus Wölfel's avatar Klaus Wölfel

Fix case where egg-link is not lower case

Before this, ZEO.egg-link was not found
parent 89548b01
...@@ -224,13 +224,14 @@ def bom_software(installed_software_path): # -> {} (name,kind) -> PkgInfo ...@@ -224,13 +224,14 @@ def bom_software(installed_software_path): # -> {} (name,kind) -> PkgInfo
continue # because software.cfg contained vspace continue # because software.cfg contained vspace
m = _egg_re.match(eggname) m = _egg_re.match(eggname)
assert m is not None, eggname assert m is not None, eggname
eggname = m.group('name') # neoppod[admin, ctl, master] -> neoppod eggfilename = m.group('name') # neoppod[admin, ctl, master] -> neoppod
eggname = eggcanon(eggname) # cython-zstd -> cython_zstd eggfilename = eggcanon(eggfilename)
eggname = eggfilename.lower() # cython-zstd -> cython_zstd
if eggname in xeggs: if eggname in xeggs:
continue # we already reported this egg via scripts above continue # we already reported this egg via scripts above
if glob('%s/%s.egg-link' % (eggdev, eggname)): if glob('%s/%s.egg-link' % (eggdev, eggfilename)):
continue # e.g. wendelin.core.egg-link points to wendelin.core cloned via git and already reported as git continue # e.g. wendelin.core.egg-link points to wendelin.core cloned via git and already reported as git
installed_eggs = [basename(_) for _ in (glob('%s/*.egg' % eggdir) + installed_eggs = [basename(_) for _ in (glob('%s/*.egg' % eggdir) +
...@@ -278,7 +279,7 @@ _egg_re = re.compile(r'^(?P<name>[\w\-\.]+)(\[.*\])?$') ...@@ -278,7 +279,7 @@ _egg_re = re.compile(r'^(?P<name>[\w\-\.]+)(\[.*\])?$')
# eggcanon returns canonical name for an egg. # eggcanon returns canonical name for an egg.
# e.g. Cython-Zstd -> cython_zstd # e.g. Cython-Zstd -> cython_zstd
def eggcanon(eggname): def eggcanon(eggname):
return eggname.lower().replace('-', '_') return eggname.replace('-', '_')
# eggscript_imports returns list of eggs put into python path in python script # eggscript_imports returns list of eggs put into python path in python script
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment