fixup! input: support for variable depends

Author: rhubert

pym/bob/input.py

@@ -2346,6 +2346,7 @@ def prepare(self, inputEnv, sandboxEnabled, inputStates, inputSandbox=None,
         directPackages = []
         indirectPackages = []
         provideDeps = UniquePackageList(stack, self.__raiseIncompatibleProvided)
+        maybeProvideDeps = {}
         checkoutDeps = []
         results = []
         depEnv = env.derive()
@@ -2355,17 +2356,14 @@ def prepare(self, inputEnv, sandboxEnabled, inputStates, inputSandbox=None,
         depDiffSandbox = diffSandbox
         depDiffTools = diffTools.copy()
         thisDeps = {}
-        depsEnv = env.derive()
         depVars = set()
 
-        __provideDeps = [ env.substitute(p, "providedDep::"+p)
-                for p in self.__provideDeps]
-
         for d in self.__deps:
             dep = copy.deepcopy(d)
             env.setFunArgs({ "recipe" : self, "sandbox" : bool(sandbox) and sandboxEnabled,
                 "__tools" : tools })
 
+            depsEnv = env.derive()
             depsEnv.touchReset()
             dep.recipe = depsEnv.substitute(dep.recipe, "dependency::"+dep.recipe)
             depVars = set([e for e in depsEnv.touchedKeys()])
@@ -2459,10 +2457,19 @@ def prepare(self, inputEnv, sandboxEnabled, inputStates, inputSandbox=None,
                 if sandboxEnabled:
                     env.update(sandbox.environment)
                     if dep.provideGlobal: depEnv.update(sandbox.environment)
-            if dep.recipe in __provideDeps:
-                provideDeps.append(depRef)
-                provideDeps.extend(CoreRef(d, [p.getName()], origDepDiffTools, origDepDiffSandbox)
-                    for d in depCoreStep.providedDeps)
+
+            l = [depRef]
+            l.append([CoreRef(d, [p.getName()], origDepDiffTools, origDepDiffSandbox)
+                        for d in depCoreStep.providedDeps])
+            maybeProvideDeps[dep.recipe] = l
+
+        __provideDeps = [ env.substitute(p, "providedDep::"+p)
+                for p in self.__provideDeps]
+
+        for recipe, refs in maybeProvideDeps.items():
+            if recipe in __provideDeps:
+                provideDeps.append(refs[0])
+                provideDeps.extend(refs[1])
 
         # Filter indirect packages and add to result list if necessary. Most
         # likely there are many duplicates that are dropped.
@@ -2554,8 +2561,8 @@ def prepare(self, inputEnv, sandboxEnabled, inputStates, inputSandbox=None,
 
         # optional checkout step
         if self.__checkout != (None, None, None) or self.__checkoutSCMs or self.__checkoutAsserts:
-            checkoutDigestEnv = env.prune(self.__checkoutVars)
-            checkoutEnv = ( env.prune(self.__checkoutVars | self.__checkoutVarsWeak | depVars)
+            checkoutDigestEnv = env.prune(self.__checkoutVars | depVars)
+            checkoutEnv = ( env.prune(self.__checkoutVars | self.__checkoutVarsWeak)
                 if self.__checkoutVarsWeak else checkoutDigestEnv )
             checkoutUpdateIf = [
                 ( (env.evaluate(cond, "checkoutUpdateIf")
@@ -2581,7 +2588,7 @@ def prepare(self, inputEnv, sandboxEnabled, inputStates, inputSandbox=None,
         # optional build step
         if self.__build != (None, None, None):
             buildDigestEnv = env.prune(self.__buildVars | depVars)
-            buildEnv = ( env.prune(self.__buildVars | self.__buildVarsWeak | depVars)
+            buildEnv = ( env.prune(self.__buildVars | self.__buildVarsWeak)
                 if self.__buildVarsWeak else buildDigestEnv )
             buildCoreStep = p.createCoreBuildStep(self.__build, buildDigestEnv, buildEnv,
                 [CoreRef(srcCoreStep)] + results)

test/unit/test_input_recipeset.py

@@ -258,12 +258,13 @@ def testVariableDeps(self):
             depends: [a]
             environment:
                 A : "b"
+                D : "c"
             buildScript: "true"
             packageScript: "true"
             """)
         self.writeRecipe("root2", """\
             root: True
-            depends: [a]
+            depends: [a, d]
             environment:
                 A : "c"
             buildScript: "true"
@@ -274,6 +275,8 @@ def testVariableDeps(self):
             depends: [ "$A" ]
             buildScript: "true"
             packageScript: "true"
+            provideVars:
+                D: "e"
             """)
 
         self.writeRecipe("b", """\
@@ -284,6 +287,18 @@ def testVariableDeps(self):
             buildScript: "true"
             packageScript: "true"
             """)
+        self.writeRecipe("d", """\
+            depends:
+             - name: a
+               use: [environment, deps]
+             - "$D"
+            buildScript: "true"
+            packageScript: "true"
+            """)
+        self.writeRecipe("e", """\
+            buildScript: "true"
+            packageScript: "true"
+            """)
 
         recipes = RecipeSet()
         recipes.parse()
@@ -293,7 +308,8 @@ def testVariableDeps(self):
         self.assertEqual(p.getName(), "b")
         p = packages.walkPackagePath("root2/a/c")
         self.assertEqual(p.getName(), "c")
-
+        p = packages.walkPackagePath("root2/d/e")
+        self.assertEqual(p.getName(), "e")
 
     def testDuplicateRemoval(self):
         """Test that provided dependencies do not replace real dependencies"""