[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3743/8267] devtool: package: don't try to initialise tinfoil twice

[Emmanuele Bassi <ebassi src gnome org>]

commit 1e29b57e9278f7d62e6357b5893556acdc0d4b9e
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Wed Dec 14 21:49:50 2016 +1300

    devtool: package: don't try to initialise tinfoil twice
    
    setup_tinfoil() already calls prepare(), we don't need to call it again
    ourselves and doing so with tinfoil2 results in "ERROR: Only one copy of
    bitbake should be run against a build directory". Calling prepare()
    twice should probably still be allowed, so that ought to be fixed
    separately, but in the mean time this code is still wrong so fix it
    here.
    
    (From OE-Core rev: 38b8a7d4aff096ea0a62f2ddf3fe2de1df591bf5)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/devtool/package.py |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/scripts/lib/devtool/package.py b/scripts/lib/devtool/package.py
index afb5809..4764064 100644
--- a/scripts/lib/devtool/package.py
+++ b/scripts/lib/devtool/package.py
@@ -28,10 +28,8 @@ def package(args, config, basepath, workspace):
     """Entry point for the devtool 'package' subcommand"""
     check_workspace_recipe(workspace, args.recipename)
 
-    tinfoil = setup_tinfoil(basepath=basepath)
+    tinfoil = setup_tinfoil(basepath=basepath, config_only=True)
     try:
-        tinfoil.prepare(config_only=True)
-
         image_pkgtype = config.get('Package', 'image_pkgtype', '')
         if not image_pkgtype:
             image_pkgtype = tinfoil.config_data.getVar('IMAGE_PKGTYPE', True)