[packages/chef/dev-14.13: 2/2] up to 14.13.16
glen
glen at pld-linux.org
Wed Aug 21 19:02:00 CEST 2019
commit 902b5cde5a99770b74de6cc5c6ade753c25d1ced
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Wed Aug 21 19:57:27 2019 +0300
up to 14.13.16
chef.spec | 2 +-
poldek.patch | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/chef.spec b/chef.spec
index 0b8688c..cb6ecc0 100644
--- a/chef.spec
+++ b/chef.spec
@@ -7,7 +7,7 @@
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
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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chef.git/commitdiff/902b5cde5a99770b74de6cc5c6ade753c25d1ced
More information about the pld-cvs-commit
mailing list