Attachment 844686 Details for Bug 1040112 – /usr/share/katello-disconnected/lib/manifest_reader.rb proposed patch

[patch] /usr/share/katello-disconnected/lib/manifest_reader.rb proposed patch

manifest_reader.rb.patch.txt (text/plain), 1.54 KB, created by cphoffma on 2014-01-02 19:35:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: cphoffma

Created: 2014-01-02 19:35:46 UTC

Size: 1.54 KB

patch

obsolete

>29c29,30
><     options.assert_valid_keys(:ssl_client_key, :ssl_client_cert, :ssl_ca_file, :verify_ssl, :proxy_host, :proxy_port, :proxy_user, :proxy_password)
>---
>>     options.assert_valid_keys(:ssl_client_key, :ssl_client_cert, :ssl_ca_file, :verify_ssl)
>>
>33c34
><       @net = ::Net::HTTP::Proxy(options[:proxy_host], options[:proxy_port], options[:proxy_user], options[:proxy_password]).new(@uri.host, @uri.port)
>---
>>       @net = ::Net::HTTP::Proxy(options[:proxy_host], oprions[:proxy_port], oprions[:proxy_user], oprions[:proxy_password]).new(@uri.host, @uri.port)
>59c60
><     req = Net::HTTP::Get.new(path)
>---
>>     req = Net::HTTP::Get.new(path)
>296,297c297,298
><     attr_accessor :proxy_host, :proxy_port, :proxy_user, :proxy_password
><     def initialize manifest_file_or_directory, cdn_url = nil, cdn_ca = nil, proxy_host = nil, proxy_port = nil, proxy_user = nil, proxy_password = nil
>---
>>
>>     def initialize manifest_file_or_directory, cdn_url = nil, cdn_ca = nil
>300,305d300
><       @proxy_host = proxy_host
><       @proxy_port = proxy_port
><       @proxy_user = proxy_user
><       @proxy_password = proxy_password
><       @proxy_user = proxy_user
><       @proxy_password = proxy_password
>369,373c364
><             :ssl_client_key => OpenSSL::PKey::RSA.new(entitlement.key),
><             :proxy_host => proxy_host,
><             :proxy_port => proxy_port,
><           :proxy_user => proxy_user,
><             :proxy_password => proxy_password))
>---
>>             :ssl_client_key => OpenSSL::PKey::RSA.new(entitlement.key)))

Actions: View | Diff

Attachments on bug 1040112: 844685 | 844686