Skip to content

Commit

Permalink
Fix missing dependecies when defining additional eggs. Distinct PYTHO…
Browse files Browse the repository at this point in the history
…NPATH locations.
  • Loading branch information
petschki committed Apr 27, 2023
1 parent 56cba11 commit 8189725
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/plone/recipe/zeoserver/recipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ def __init__(self, buildout, name, options):
self.egg = zc.recipe.egg.Egg(buildout, options["recipe"], options)
self.buildout, self.options, self.name = buildout, options, name

if self.options.get("eggs") and options["recipe"] not in self.options["eggs"]:
# make sure we do not loose our own dependencies if additional eggs are provided
self.options["eggs"] += "\n%s" % options["recipe"]

options["location"] = os.path.join(
buildout["buildout"]["parts-directory"],
self.name,
Expand All @@ -45,7 +49,7 @@ def __init__(self, buildout, name, options):
@property
def ws_locations(self):
if self._ws_locations is None:
self._ws_locations = [d.location for d in self.zodb_ws]
self._ws_locations = {d.location for d in self.zodb_ws}
return self._ws_locations

def install(self):
Expand Down

0 comments on commit 8189725

Please sign in to comment.