From 4eb240d98a420f52145b1d33b5ddac8f77c2a912 Mon Sep 17 00:00:00 2001 From: Matthias Fetzer Date: Fri, 28 Feb 2025 17:35:23 +0100 Subject: [PATCH 1/2] fix: Do not hard code package name in puppet_agent_end_run.rb --- .../puppet_agent_end_run/puppet_agent_end_run.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/puppet/provider/puppet_agent_end_run/puppet_agent_end_run.rb b/lib/puppet/provider/puppet_agent_end_run/puppet_agent_end_run.rb index d49c1b09..d14231ac 100644 --- a/lib/puppet/provider/puppet_agent_end_run/puppet_agent_end_run.rb +++ b/lib/puppet/provider/puppet_agent_end_run/puppet_agent_end_run.rb @@ -32,8 +32,13 @@ def needs_upgrade? return false if desired_version == 'present' if desired_version == 'latest' - latest_version = @resource.catalog.resource('package', 'puppet-agent').parameters[:ensure].latest - desired_version = latest_version.match(%r{^(?:[0-9]:)?(\d+\.\d+(\.\d+)?(?:\.\d+))?}).captures.first + # Package name might be different to puppet-agent, hence we need to look it up. + package_name = @resource.catalog.resource('class', 'puppet_agent')[:package_name] + + # Latest version might be undefined, e.G. if we're about to install a different named + # package than the currently running one. In that case, we'll leave desired_version empty. + latest_version = @resource.catalog.resource('package', package_name).parameters[:ensure].latest + desired_version = latest_version.match(%r{^(?:[0-9]:)?(\d+\.\d+(\.\d+)?(?:\.\d+))?}).captures.first unless latest_version.nil? end Puppet::Util::Package.versioncmp(desired_version, current_version) != 0 From 2970d3ca6e131e7cfd50903fda2c4d82b61a74c9 Mon Sep 17 00:00:00 2001 From: Matthias Fetzer Date: Fri, 28 Feb 2025 18:28:47 +0100 Subject: [PATCH 2/2] fix: Remove trailing space from empty line --- .../provider/puppet_agent_end_run/puppet_agent_end_run.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/puppet_agent_end_run/puppet_agent_end_run.rb b/lib/puppet/provider/puppet_agent_end_run/puppet_agent_end_run.rb index d14231ac..043660a7 100644 --- a/lib/puppet/provider/puppet_agent_end_run/puppet_agent_end_run.rb +++ b/lib/puppet/provider/puppet_agent_end_run/puppet_agent_end_run.rb @@ -34,7 +34,7 @@ def needs_upgrade? if desired_version == 'latest' # Package name might be different to puppet-agent, hence we need to look it up. package_name = @resource.catalog.resource('class', 'puppet_agent')[:package_name] - + # Latest version might be undefined, e.G. if we're about to install a different named # package than the currently running one. In that case, we'll leave desired_version empty. latest_version = @resource.catalog.resource('package', package_name).parameters[:ensure].latest