File call-zypper-retry.patch of Package rubygem-chef

Overview Repositories Revisions Requests Users Attributes Meta

File call-zypper-retry.patch of Package rubygem-chef

From 5a13e0c48821ffd1245d4404d17d4474058c57f3 Mon Sep 17 00:00:00 2001
From: Martin Vidner <mvidner@suse.cz>
Date: Tue, 7 Aug 2012 15:44:29 +0200
Subject: [PATCH] Call zypper-retry, a wrapper waiting on the zypp lock
 (bnc#772965)

--- a/lib/chef/provider/package/zypper.rb
+++ b/lib/chef/provider/package/zypper.rb
@@ -41,7 +41,7 @@
           version=''
           oud_version=''
           Chef::Log.debug("#{@new_resource} checking zypper")
-          status = popen4("rpm -q --qf 'Rpm: %{VERSION}-%{RELEASE}\n' #{@new_resource.package_name} || zypper -n info #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
+          status = popen4("rpm -q --qf 'Rpm: %{VERSION}-%{RELEASE}\n' #{@new_resource.package_name} || zypper-retry -n info #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               case line
               when /^Version: (.+)$/
@@ -116,9 +116,9 @@
           version = "=#{version}" unless version.empty?
 
           if zypper_version < 1.0
-            shell_out!("zypper#{gpg_checks} #{command} -y #{pkgname}")
+            shell_out!("zypper-retry#{gpg_checks} #{command} -y #{pkgname}")
           else
-            shell_out!("zypper --non-interactive#{gpg_checks} " +
+            shell_out!("zypper-retry --non-interactive#{gpg_checks} " +
               "#{command} #{pkgname}#{version}")
           end
         end

Places

File call-zypper-retry.patch of Package rubygem-chef

Places