From 42f8de76b1e1f94b5d5cd5f01088a828c80e9093 Mon Sep 17 00:00:00 2001 From: Swapnil Jain <65277773+swjai@users.noreply.github.com> Date: Thu, 19 Jan 2023 15:03:06 +0530 Subject: [PATCH 1/9] Update nxAvailableUpdates.py --- .../Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py b/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py index 0956e38e8..c05576e1a 100644 --- a/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py +++ b/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py @@ -12,6 +12,7 @@ import fnmatch import time import os +import uuid protocol = imp.load_source('protocol', '../protocol.py') nxDSCLog = imp.load_source('nxDSCLog', '../nxDSCLog.py') @@ -71,9 +72,11 @@ def GetAptUpdates(Name): updates_list = [] d = {} + g_guid = str(uuid.uuid4()) #Collect Security updates - security_sources_list = '/tmp/az-update-security.list' + security_sources_list = '/tmp/aumv1-oms-assess-security-{0}.list'.format(g_guid) prep_security_sources_list_cmd = 'grep security /etc/apt/sources.list > ' + security_sources_list + remove_security_sources_list_cmd = 'sudo rm ' + '/tmp/aumv1-oms-assess-security-*.list' #to remove all files, following this pattern dist_upgrade_simulation_cmd_template = 'LANG=en_US.UTF8 apt-get -s dist-upgrade ' # Refresh the repo if helperlib.CONFIG_SYSCONFDIR_DSC == "omsconfig": @@ -112,10 +115,13 @@ def GetAptUpdates(Name): d['Classification'] = "Others" d['Repository'] = pkg[2] updates_list.append(copy.deepcopy(d)) + + code, out = RunGetOutput(remove_security_sources_list_cmd,False,False) + if code != 0: + LG().Log('DEBUG', out) LG().Log('DEBUG', "Number of packages being written to the XML: " + str(len(updates_list))) return updates_list - def GetYumUpdates(Name): # Format: # Name : zsh From 26da23148f8d774a18d470a88b94430472d7cdb4 Mon Sep 17 00:00:00 2001 From: Swapnil Jain <65277773+swjai@users.noreply.github.com> Date: Thu, 19 Jan 2023 15:12:05 +0530 Subject: [PATCH 2/9] Update nxAvailableUpdates.py --- Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py b/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py index 6a4953040..51cac81c9 100644 --- a/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py +++ b/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py @@ -12,6 +12,7 @@ import fnmatch import time import os +import uuid protocol = imp.load_source('protocol', '../protocol.py') nxDSCLog = imp.load_source('nxDSCLog', '../nxDSCLog.py') @@ -69,9 +70,11 @@ def GetAptUpdates(Name): updates_list = [] d = {} + g_guid = str(uuid.uuid4()) #Collect Security updates - security_sources_list = '/tmp/az-update-security.list' + security_sources_list = '/tmp/aumv1-oms-assess-security-{0}.list'.format(g_guid) prep_security_sources_list_cmd = 'grep security /etc/apt/sources.list > ' + security_sources_list + remove_security_sources_list_cmd = 'sudo rm ' + '/tmp/aumv1-oms-assess-security-*.list' #to remove all files, following this pattern dist_upgrade_simulation_cmd_template = 'LANG=en_US.UTF8 apt-get -s dist-upgrade ' # Refresh the repo if helperlib.CONFIG_SYSCONFDIR_DSC == "omsconfig": @@ -110,6 +113,10 @@ def GetAptUpdates(Name): d['Classification'] = "Others" d['Repository'] = pkg[2] updates_list.append(copy.deepcopy(d)) + + code, out = RunGetOutput(remove_security_sources_list_cmd,False,False) + if code != 0: + LG().Log('DEBUG', out) LG().Log('DEBUG', "Number of packages being written to the XML: " + str(len(updates_list))) return updates_list @@ -467,4 +474,4 @@ def GetPackageManager(): if ret == 'apt-get': ret = 'apt' break - return ret \ No newline at end of file + return ret From 63be910fbf007ee8c6e3f67bcde1bde5488b7907 Mon Sep 17 00:00:00 2001 From: Swapnil Jain <65277773+swjai@users.noreply.github.com> Date: Thu, 19 Jan 2023 15:14:20 +0530 Subject: [PATCH 3/9] Update nxAvailableUpdates.py --- .../Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py b/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py index e22489739..165fe3eb8 100644 --- a/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py +++ b/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py @@ -12,6 +12,7 @@ import fnmatch import time import os +import uuid protocol = imp.load_source('protocol', '../protocol.py') nxDSCLog = imp.load_source('nxDSCLog', '../nxDSCLog.py') @@ -71,9 +72,11 @@ def GetAptUpdates(Name): updates_list = [] d = {} + g_guid = str(uuid.uuid4()) #Collect Security updates - security_sources_list = '/tmp/az-update-security.list' + security_sources_list = '/tmp/aumv1-oms-assess-security-{0}.list'.format(g_guid) prep_security_sources_list_cmd = 'grep security /etc/apt/sources.list > ' + security_sources_list + remove_security_sources_list_cmd = 'sudo rm ' + '/tmp/aumv1-oms-assess-security-*.list' #to remove all files, following this pattern dist_upgrade_simulation_cmd_template = 'LANG=en_US.UTF8 apt-get -s dist-upgrade ' # Refresh the repo if helperlib.CONFIG_SYSCONFDIR_DSC == "omsconfig": @@ -112,6 +115,10 @@ def GetAptUpdates(Name): d['Classification'] = "Others" d['Repository'] = pkg[2] updates_list.append(copy.deepcopy(d)) + + code, out = RunGetOutput(remove_security_sources_list_cmd,False,False) + if code != 0: + LG().Log('DEBUG', out) LG().Log('DEBUG', "Number of packages being written to the XML: " + str(len(updates_list))) return updates_list From 1e8ae818d4fdf118b3af0778c175a0d39f97761f Mon Sep 17 00:00:00 2001 From: Swapnil Jain <65277773+swjai@users.noreply.github.com> Date: Thu, 19 Jan 2023 15:50:30 +0530 Subject: [PATCH 4/9] Update nxAvailableUpdates.py --- Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py b/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py index 165fe3eb8..056e72bd6 100644 --- a/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py +++ b/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py @@ -200,8 +200,7 @@ def GetYumUpdates(Name): if len(param_list) == 0 and len(param_list2) > 0: LG().Log('DEBUG', "No valid packages found. Falling back to package_info based on the package name.") - param_list = param_list2 - + cmd = "LANG=en_US.UTF8 " + yum_info + param_list LG().Log('DEBUG', "Retrieving individual package information from Yum using cmd: " + cmd) start_time = time.time() From dfbe29fc73e72b62b9a97a65955862eaec4cdc86 Mon Sep 17 00:00:00 2001 From: Swapnil Jain <65277773+swjai@users.noreply.github.com> Date: Thu, 19 Jan 2023 15:50:55 +0530 Subject: [PATCH 5/9] Update nxAvailableUpdates.py --- Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py b/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py index c05576e1a..7780283d3 100644 --- a/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py +++ b/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py @@ -199,7 +199,6 @@ def GetYumUpdates(Name): if len(param_list) == 0 and len(param_list2) > 0: LG().Log('DEBUG', "No valid packages found. Falling back to package_info based on the package name.") - param_list = param_list2 cmd = "LANG=en_US.UTF8 " + yum_info + param_list LG().Log('DEBUG', "Retrieving individual package information from Yum using cmd: " + cmd) From 88dbd081588f2d31e22bbdce5e7b36adc0c9ce69 Mon Sep 17 00:00:00 2001 From: Swapnil Jain <65277773+swjai@users.noreply.github.com> Date: Thu, 19 Jan 2023 15:51:28 +0530 Subject: [PATCH 6/9] Update nxAvailableUpdates.py --- Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py b/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py index 51cac81c9..0a3fcde41 100644 --- a/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py +++ b/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py @@ -198,7 +198,6 @@ def GetYumUpdates(Name): if len(param_list) == 0 and len(param_list2) > 0: LG().Log('DEBUG', "No valid packages found. Falling back to package_info based on the package name.") - param_list = param_list2 cmd = "LANG=en_US.UTF8 " + yum_info + param_list LG().Log('DEBUG', "Retrieving individual package information from Yum using cmd: " + cmd) From ce2ba62bbc1dec6fe2a8de9d93af6fc3657f39be Mon Sep 17 00:00:00 2001 From: Swapnil Jain <65277773+swjai@users.noreply.github.com> Date: Wed, 25 Jan 2023 16:11:49 +0530 Subject: [PATCH 7/9] Update nxAvailableUpdates.py --- Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py b/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py index 0a3fcde41..38ead4f81 100644 --- a/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py +++ b/Providers/Scripts/3.x/Scripts/nxAvailableUpdates.py @@ -74,7 +74,7 @@ def GetAptUpdates(Name): #Collect Security updates security_sources_list = '/tmp/aumv1-oms-assess-security-{0}.list'.format(g_guid) prep_security_sources_list_cmd = 'grep security /etc/apt/sources.list > ' + security_sources_list - remove_security_sources_list_cmd = 'sudo rm ' + '/tmp/aumv1-oms-assess-security-*.list' #to remove all files, following this pattern + remove_security_sources_list_cmd = 'rm ' + '/tmp/aumv1-oms-assess-security-*.list' #to remove all files, following this pattern dist_upgrade_simulation_cmd_template = 'LANG=en_US.UTF8 apt-get -s dist-upgrade ' # Refresh the repo if helperlib.CONFIG_SYSCONFDIR_DSC == "omsconfig": From e986ff264974e64e41b5edd098427972668b818c Mon Sep 17 00:00:00 2001 From: Swapnil Jain <65277773+swjai@users.noreply.github.com> Date: Wed, 25 Jan 2023 16:12:06 +0530 Subject: [PATCH 8/9] Update nxAvailableUpdates.py --- Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py b/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py index 7780283d3..fbaf175a4 100644 --- a/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py +++ b/Providers/Scripts/2.6x-2.7x/Scripts/nxAvailableUpdates.py @@ -76,7 +76,7 @@ def GetAptUpdates(Name): #Collect Security updates security_sources_list = '/tmp/aumv1-oms-assess-security-{0}.list'.format(g_guid) prep_security_sources_list_cmd = 'grep security /etc/apt/sources.list > ' + security_sources_list - remove_security_sources_list_cmd = 'sudo rm ' + '/tmp/aumv1-oms-assess-security-*.list' #to remove all files, following this pattern + remove_security_sources_list_cmd = 'rm ' + '/tmp/aumv1-oms-assess-security-*.list' #to remove all files, following this pattern dist_upgrade_simulation_cmd_template = 'LANG=en_US.UTF8 apt-get -s dist-upgrade ' # Refresh the repo if helperlib.CONFIG_SYSCONFDIR_DSC == "omsconfig": From 3b80b6134c5ae7bb9a38524b1b4d0ebd7d2af382 Mon Sep 17 00:00:00 2001 From: Swapnil Jain <65277773+swjai@users.noreply.github.com> Date: Wed, 25 Jan 2023 16:12:23 +0530 Subject: [PATCH 9/9] Update nxAvailableUpdates.py --- Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py b/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py index 056e72bd6..3b850e1d7 100644 --- a/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py +++ b/Providers/Scripts/2.4x-2.5x/Scripts/nxAvailableUpdates.py @@ -76,7 +76,7 @@ def GetAptUpdates(Name): #Collect Security updates security_sources_list = '/tmp/aumv1-oms-assess-security-{0}.list'.format(g_guid) prep_security_sources_list_cmd = 'grep security /etc/apt/sources.list > ' + security_sources_list - remove_security_sources_list_cmd = 'sudo rm ' + '/tmp/aumv1-oms-assess-security-*.list' #to remove all files, following this pattern + remove_security_sources_list_cmd = 'rm ' + '/tmp/aumv1-oms-assess-security-*.list' #to remove all files, following this pattern dist_upgrade_simulation_cmd_template = 'LANG=en_US.UTF8 apt-get -s dist-upgrade ' # Refresh the repo if helperlib.CONFIG_SYSCONFDIR_DSC == "omsconfig":