[PATCH] opkg-utils: Fix crash on dependency error

[PATCH] opkg-utils: Fix crash on dependency error

[Haris Okanovic]

Fix crash on exception in opkg-show-deps when generating an
'unsatisfied dependency' error. process_dep() function was
referencing a missing parameter `pkg`.

Signed-off-by: Haris Okanovic <haris.okanovic@ni.com>
Reviewed-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Acked-by: Brad Mouring <brad.mouring@ni.com>
Cc: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Cc: Paul Barker <paul@paulbarker.me.uk>
---
 opkg-show-deps | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opkg-show-deps b/opkg-show-deps
index 3c3be6a..4694579 100755
--- a/opkg-show-deps
+++ b/opkg-show-deps
@@ -58,7 +58,7 @@ def find_package(name):
           return provider_hash[name]
      return None
 
-def process_dep(dep):
+def process_dep(pkg, dep):
      # Add a provider of the given dependency to the list of required packages
      # unless a provider is already present in this list.
      dep = re.sub("\s*\(.*\)", "", dep)
@@ -83,7 +83,7 @@ def recurse(pkg):
      if pkg.depends:
           deps = split_list(pkg.depends)
           for dep in deps:
-               process_dep(dep)
+               process_dep(pkg, dep)
 
 for root in remaining_args:
      pkgs = find_package(root)
-- 
2.2.2

Re: [opkg-devel] [PATCH] opkg-utils: Fix crash on dependency error

[Alejandro del Castillo]

On 05/21/2015 06:27 PM, Haris Okanovic wrote:
> Fix crash on exception in opkg-show-deps when generating an
> 'unsatisfied dependency' error. process_dep() function was
> referencing a missing parameter `pkg`.
> 
> Signed-off-by: Haris Okanovic <haris.okanovic@ni.com>
> Reviewed-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
> Acked-by: Brad Mouring <brad.mouring@ni.com>
> Cc: Alejandro del Castillo <alejandro.delcastillo@ni.com>
> Cc: Paul Barker <paul@paulbarker.me.uk>
> ---
>  opkg-show-deps | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/opkg-show-deps b/opkg-show-deps
> index 3c3be6a..4694579 100755
> --- a/opkg-show-deps
> +++ b/opkg-show-deps
> @@ -58,7 +58,7 @@ def find_package(name):
>            return provider_hash[name]
>       return None
>  
> -def process_dep(dep):
> +def process_dep(pkg, dep):
>       # Add a provider of the given dependency to the list of required packages
>       # unless a provider is already present in this list.
>       dep = re.sub("\s*\(.*\)", "", dep)
> @@ -83,7 +83,7 @@ def recurse(pkg):
>       if pkg.depends:
>            deps = split_list(pkg.depends)
>            for dep in deps:
> -               process_dep(dep)
> +               process_dep(pkg, dep)
>  
>  for root in remaining_args:
>       pkgs = find_package(root)
> 

Pulled into master, apologies for the delay!

-- 
Cheers,

Alejandro

Re: [opkg-devel] [PATCH] opkg-utils: Fix crash on dependency error

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1911 bytes --]


> On Sep 29, 2015, at 9:10 AM, Alejandro del Castillo <alejandro.delcastillo@ni.com> wrote:
> 
> On 05/21/2015 06:27 PM, Haris Okanovic wrote:
>> Fix crash on exception in opkg-show-deps when generating an
>> 'unsatisfied dependency' error. process_dep() function was
>> referencing a missing parameter `pkg`.
>> 
>> Signed-off-by: Haris Okanovic <haris.okanovic@ni.com>
>> Reviewed-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
>> Acked-by: Brad Mouring <brad.mouring@ni.com>
>> Cc: Alejandro del Castillo <alejandro.delcastillo@ni.com>
>> Cc: Paul Barker <paul@paulbarker.me.uk>
>> ---
>> opkg-show-deps | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/opkg-show-deps b/opkg-show-deps
>> index 3c3be6a..4694579 100755
>> --- a/opkg-show-deps
>> +++ b/opkg-show-deps
>> @@ -58,7 +58,7 @@ def find_package(name):
>>           return provider_hash[name]
>>      return None
>> 
>> -def process_dep(dep):
>> +def process_dep(pkg, dep):
>>      # Add a provider of the given dependency to the list of required packages
>>      # unless a provider is already present in this list.
>>      dep = re.sub("\s*\(.*\)", "", dep)
>> @@ -83,7 +83,7 @@ def recurse(pkg):
>>      if pkg.depends:
>>           deps = split_list(pkg.depends)
>>           for dep in deps:
>> -               process_dep(dep)
>> +               process_dep(pkg, dep)
>> 
>> for root in remaining_args:
>>      pkgs = find_package(root)
>> 
> 
> Pulled into master, apologies for the delay!


can you also pull in

http://git.openembedded.org/openembedded-core/tree/meta/recipes-devtools/opkg/opkg/0001-libopkg-include-stdio.h-for-getting-FILE-defined.patch

> 
> --
> Cheers,
> 
> Alejandro
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]