Revert "cve-update-db-native: show IP on failure"

The bug this was intended to find has been resolved, so we don't need
this extra noise in the logs.

This reverts commit bd1edfa3d5b1c24cd1192620f7085ee1df03e1af.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-core/meta/cve-update-db-native.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

On Fri, 2023-01-27 at 13:40 +0000, Ross Burton wrote:
> The bug this was intended to find has been resolved, so we don't need
> this extra noise in the logs.
> 
> This reverts commit bd1edfa3d5b1c24cd1192620f7085ee1df03e1af.
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/recipes-core/meta/cve-update-db-native.bb | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb
> index e042e67b09a..079f062f79b 100644
> --- a/meta/recipes-core/meta/cve-update-db-native.bb
> +++ b/meta/recipes-core/meta/cve-update-db-native.bb
> @@ -130,10 +130,7 @@ def update_db_file(db_tmp_file, d):
>                  response = urllib.request.urlopen(meta_url, timeout=cve_socket_timeout)
>              except urllib.error.URLError as e:
>                  cve_f.write('Warning: CVE db update error, Unable to fetch CVE data.\n\n')
> -                bb.warn("Failed to fetch CVE data (%s)" % e)
> -                import socket
> -                result = socket.getaddrinfo("nvd.nist.gov", 443, proto=socket.IPPROTO_TCP)
> -                bb.warn("Host IPs are %s" % (", ".join(t[4][0] for t in result)))
> +                bb.warn("Failed to fetch CVE data (%s)" % e.reason)
>                  return False
>  
>              if response:

Since the error is only shown on failure cases, isn't this better left?

Cheers,

Richard

On 27 Jan 2023, at 14:25, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
> 
> On Fri, 2023-01-27 at 13:40 +0000, Ross Burton wrote:
>> The bug this was intended to find has been resolved, so we don't need
>> this extra noise in the logs.
>> 
>> This reverts commit bd1edfa3d5b1c24cd1192620f7085ee1df03e1af.
>> 
>> Signed-off-by: Ross Burton <ross.burton@arm.com>
>> ---
>> meta/recipes-core/meta/cve-update-db-native.bb | 5 +----
>> 1 file changed, 1 insertion(+), 4 deletions(-)
>> 
>> diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb
>> index e042e67b09a..079f062f79b 100644
>> --- a/meta/recipes-core/meta/cve-update-db-native.bb
>> +++ b/meta/recipes-core/meta/cve-update-db-native.bb
>> @@ -130,10 +130,7 @@ def update_db_file(db_tmp_file, d):
>>                 response = urllib.request.urlopen(meta_url, timeout=cve_socket_timeout)
>>             except urllib.error.URLError as e:
>>                 cve_f.write('Warning: CVE db update error, Unable to fetch CVE data.\n\n')
>> -                bb.warn("Failed to fetch CVE data (%s)" % e)
>> -                import socket
>> -                result = socket.getaddrinfo("nvd.nist.gov", 443, proto=socket.IPPROTO_TCP)
>> -                bb.warn("Host IPs are %s" % (", ".join(t[4][0] for t in result)))
>> +                bb.warn("Failed to fetch CVE data (%s)" % e.reason)
>>                 return False
>> 
>>             if response:
> 
> Since the error is only shown on failure cases, isn't this better left?

It’s boring noise and doesn’t serve any purpose, now that we understand the reason behind the issue it was added to debug.  Keep it if you want, but I don’t see the need.

Ross