[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2710/8267] recipetool: newappend: drop _provide_to_pn



commit c8089ae2339dc713dbec36bb97eb83975b6a6015
Author: Christopher Larson <chris_larson mentor com>
Date:   Tue Sep 27 11:25:09 2016 -0700

    recipetool: newappend: drop _provide_to_pn
    
    This function was broken by the multi-config changes, and isn't needed anymore
    now that recipeutils.pn_to_recipe can handle provides. Without this, the
    newappend sub-command fails.
    
    (From OE-Core rev: 4a5028dc3d1ab2f97465e63db5b05de73daebdfa)
    
    Signed-off-by: Christopher Larson <chris_larson mentor com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/recipetool/newappend.py |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/scripts/lib/recipetool/newappend.py b/scripts/lib/recipetool/newappend.py
index 4fbb40a..fbdd7bc 100644
--- a/scripts/lib/recipetool/newappend.py
+++ b/scripts/lib/recipetool/newappend.py
@@ -39,16 +39,6 @@ def tinfoil_init(instance):
     tinfoil = instance
 
 
-def _provide_to_pn(cooker, provide):
-    """Get the name of the preferred recipe for the specified provide."""
-    import bb.providers
-    filenames = cooker.recipecache.providers[provide]
-    eligible, foundUnique = bb.providers.filterProviders(filenames, provide, cooker.expanded_data, 
cooker.recipecache)
-    filename = eligible[0]
-    pn = cooker.recipecache.pkg_fn[filename]
-    return pn
-
-
 def _get_recipe_file(cooker, pn):
     import oe.recipeutils
     recipefile = oe.recipeutils.pn_to_recipe(cooker, pn)
@@ -70,8 +60,7 @@ def layer(layerpath):
 def newappend(args):
     import oe.recipeutils
 
-    pn = _provide_to_pn(tinfoil.cooker, args.target)
-    recipe_path = _get_recipe_file(tinfoil.cooker, pn)
+    recipe_path = _get_recipe_file(tinfoil.cooker, args.target)
 
     rd = tinfoil.config_data.createCopy()
     rd.setVar('FILE', recipe_path)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]