From ffe3d92626a9e492dafe445024d1aaaa66f389be Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 21 Aug 2019 19:57:27 +0300 Subject: [PATCH] up to 14.13.16 --- chef.spec | 4 ++-- poldek.patch | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/chef.spec b/chef.spec index 0b8688c..99c17d5 100644 --- a/chef.spec +++ b/chef.spec @@ -7,12 +7,12 @@ Summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure Name: chef -Version: 14.13.15 +Version: 14.13.16 Release: 1 License: Apache v2.0 Group: Networking/Admin Source0: https://github.com/chef/chef/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 95a6ba0d3dd61dd01f3c1511e92e2ba3 +# Source0-md5: 67898b54b1a9f74fcc2f0d28d357c4c0 Source2: %{name}.tmpfiles Source3: https://raw.github.com/stevendanna/knife-hacks/master/shell/knife_completion.sh # Source3-md5: a4c1e41370be8088a59ddb3b2e7ea397 diff --git a/poldek.patch b/poldek.patch index adfe888..a92b008 100644 --- a/poldek.patch +++ b/poldek.patch @@ -4,7 +4,7 @@ https://github.com/chef/chef/pull/7482 diff --git a/lib/chef/provider/package/poldek.rb b/lib/chef/provider/package/poldek.rb new file mode 100644 -index 000000000..a4d17ba67 +index 000000000..c7dc21862 --- /dev/null +++ b/lib/chef/provider/package/poldek.rb @@ -0,0 +1,137 @@ @@ -77,7 +77,7 @@ index 000000000..a4d17ba67 + def install_package(names, versions) + logger.trace("#{new_resource} installing package #{names} version #{versions}") + update_indexes -+ poldek(options, "-u", names) ++ poldek("-u", names) + end + + def upgrade_package(names, versions) @@ -87,22 +87,22 @@ index 000000000..a4d17ba67 + + def remove_package(names, versions) + logger.trace("#{new_resource} removing package #{names} version #{versions}") -+ poldek(options, "-e", names) ++ poldek("-e", names) + end + + private + @@updated = Hash.new + + def update_indexes() -+ checksum = Digest::MD5.hexdigest(opts).to_s ++ checksum = Digest::MD5.hexdigest(opts).to_s + -+ if @@updated[checksum] -+ return -+ end ++ if @@updated[checksum] ++ return ++ end + -+ logger.debug("#{@new_resource} updating package indexe") -+ poldek("--up", options, :env => nil) -+ @@updated[checksum] = true ++ logger.debug("#{new_resource} updating package indexes") ++ poldek("--up") ++ @@updated[checksum] = true + end + + def opts @@ -139,7 +139,7 @@ index 000000000..a4d17ba67 + end + + def poldek(*args) -+ shell_out_compact_timeout!(%w{poldek -q --noask}, *args, env: nil, returns: [0, 1, 255]) ++ shell_out_compact_timeout!(%w{poldek -q --noask}, options, *args, env: nil, returns: [0, 1, 255]) + end + end + end -- 2.44.0