Commit 22de517e authored by Kirill Smelkov's avatar Kirill Smelkov

zc.recipe.egg: `:egg` might be missing

-> in such a case the recipe uses section name as the default name for installed egg.
parent 34c4526c
...@@ -154,7 +154,7 @@ def bom_software(installed_software_path): # -> {} name -> PkgInfo ...@@ -154,7 +154,7 @@ def bom_software(installed_software_path): # -> {} name -> PkgInfo
# TODO it is better to fix zc.recipe.egg to save the full information, so that we can build BOM just from .installed.cfg # TODO it is better to fix zc.recipe.egg to save the full information, so that we can build BOM just from .installed.cfg
eggdir = part['_e'] eggdir = part['_e']
eggdev = part['_d'] eggdev = part['_d']
eggs = part['eggs'].split('\n') eggs = part.get('eggs', part.name).split('\n')
for eggname in eggs: for eggname in eggs:
m = _egg_re.match(eggname) m = _egg_re.match(eggname)
assert m is not None, eggname assert m is not None, eggname
......
...@@ -194,6 +194,18 @@ eggs = pygolang ...@@ -194,6 +194,18 @@ eggs = pygolang
pygolang 0.1 https://pypi.org/project/pygolang/0.1/ pygolang 0.1 https://pypi.org/project/pygolang/0.1/
""") """)
# no `eggs =`
case1("""\
[selenium]
recipe = zc.recipe.egg
_d = /ROOT/develop-eggs
_e = /ROOT/eggs
-- /ROOT/eggs/selenium-3.141.0-py2.7.egg/x --
""", """
>>> eggs:
selenium 3.141.0 https://pypi.org/project/selenium/3.141.0/
""")
# %20 in URL # %20 in URL
case1("""\ case1("""\
[zabbix-agent] [zabbix-agent]
......
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