Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nxd-bom
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Klaus Wölfel
nxd-bom
Commits
33bb282e
Commit
33bb282e
authored
Oct 17, 2023
by
Klaus Wölfel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix case where egg-link is not lower case
Before this, ZEO.egg-link was not found
parent
89548b01
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
nxdbom/__init__.py
nxdbom/__init__.py
+5
-4
No files found.
nxdbom/__init__.py
View file @
33bb282e
...
@@ -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
,
egg
file
name
)):
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment