Permalink
Browse files

Patch - rename "pk_id" argument to "patch_id" to be consistent

  • Loading branch information...
1 parent aea1e50 commit 39bd149e5fd75616360e7162c29593438e449f2e @lslezak lslezak committed Jan 2, 2013
Showing with 5 additions and 5 deletions.
  1. +5 −5 plugins/software/app/models/patch.rb
@@ -366,7 +366,7 @@ def self.license
end
- def self.do_install(pk_id, signal_list = [], &block)
+ def self.do_install(patch_id, signal_list = [], &block)
#locking PackageKit for single use
ok = true
error = ''
@@ -399,7 +399,7 @@ def self.do_install(pk_id, signal_list = [], &block)
proxy.on_signal("EulaRequired") do |eula_id, package_id, vendor_name, license_text|
Rails.logger.info "EULA #{eula_id.inspect} is required for #{package_id.inspect}"
- create_eula(eula_id, package_id, pk_id, license_text)
+ create_eula(eula_id, package_id, patch_id, license_text)
ok = false
error = :eula
dbusloop.quit
@@ -410,10 +410,10 @@ def self.do_install(pk_id, signal_list = [], &block)
transaction_iface.methods["UpdatePackages"].params[0][0] == "only_trusted"
#PackageKit of 11.2
transaction_iface.UpdatePackages(true, #only_trusted
- [pk_id])
+ [patch_id])
else
#PackageKit older versions like SLES11
- transaction_iface.UpdatePackages([pk_id])
+ transaction_iface.UpdatePackages([patch_id])
end
dbusloop.run
@@ -434,7 +434,7 @@ def self.do_install(pk_id, signal_list = [], &block)
Rails.logger.error "Received PackageKit error: #{error}" unless error.blank?
- remove_eulas(pk_id) if ok
+ remove_eulas(patch_id) if ok
return [ ok, error ]
end

0 comments on commit 39bd149

Please sign in to comment.