[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4526/8267] bitbake: fetch2/npm: handle items only in optionalDependencies

[Emmanuele Bassi <ebassi src gnome org>]

commit eed25ff021f1919df08535042e505c6697496837
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Tue Feb 7 09:08:50 2017 +1300

    bitbake: fetch2/npm: handle items only in optionalDependencies
    
    An npm package.json file has two dependency fields: dependencies and
    optionalDependencies. An item in optionalDependencies *may* also be
    listed in dependencies, but this is not required (and not necessary
    since if it's in optionalDependencies it will be optional, adding it to
    dependencies won't do anything). The code here was assuming that an
    optional dependency would always be in both, that's probably because
    that was true of the examples I was looking at at the time. To fix it,
    just add the optional ones to the list we're iterating over.
    
    (Bitbake rev: c0c50d43266150a80be31ae2c6fcaf37f5ba231d)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/fetch2/npm.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py
index 3e35292..8c32f81 100644
--- a/bitbake/lib/bb/fetch2/npm.py
+++ b/bitbake/lib/bb/fetch2/npm.py
@@ -195,6 +195,7 @@ class Npm(FetchMethod):
 
         dependencies = pdata.get('dependencies', {})
         optionalDependencies = pdata.get('optionalDependencies', {})
+        dependencies.update(optionalDependencies)
         depsfound = {}
         optdepsfound = {}
         data[pkg]['deps'] = {}