|
 |
9179ba |
diff --git a/rel-eng/packages/subscription-manager b/rel-eng/packages/subscription-manager
|
|
|
9179ba |
index 69983e3..00b1473 100644
|
|
|
9179ba |
--- a/rel-eng/packages/subscription-manager
|
|
|
9179ba |
+++ b/rel-eng/packages/subscription-manager
|
|
|
9179ba |
@@ -1 +1 @@
|
|
|
9179ba |
-1.10.14-9 ./
|
|
|
9179ba |
+1.10.14-10 ./
|
|
|
9179ba |
diff --git a/src/subscription_manager/cp_provider.py b/src/subscription_manager/cp_provider.py
|
|
|
9179ba |
index b910359..b54d757 100644
|
|
|
9179ba |
--- a/src/subscription_manager/cp_provider.py
|
|
|
9179ba |
+++ b/src/subscription_manager/cp_provider.py
|
|
|
9179ba |
@@ -80,6 +80,9 @@ class CPProvider(object):
|
|
|
9179ba |
def get_consumer_auth_cp(self):
|
|
|
9179ba |
if not self.consumer_auth_cp:
|
|
|
9179ba |
self.consumer_auth_cp = connection.UEPConnection(
|
|
|
9179ba |
+ host=self.server_hostname,
|
|
|
9179ba |
+ ssl_port=self.server_port,
|
|
|
9179ba |
+ handler=self.server_prefix,
|
|
|
9179ba |
proxy_hostname=self.proxy_hostname,
|
|
|
9179ba |
proxy_port=self.proxy_port,
|
|
|
9179ba |
proxy_user=self.proxy_user,
|
|
|
9179ba |
@@ -90,6 +93,9 @@ class CPProvider(object):
|
|
|
9179ba |
def get_basic_auth_cp(self):
|
|
|
9179ba |
if not self.basic_auth_cp:
|
|
|
9179ba |
self.basic_auth_cp = connection.UEPConnection(
|
|
|
9179ba |
+ host=self.server_hostname,
|
|
|
9179ba |
+ ssl_port=self.server_port,
|
|
|
9179ba |
+ handler=self.server_prefix,
|
|
|
9179ba |
proxy_hostname=self.proxy_hostname,
|
|
|
9179ba |
proxy_port=self.proxy_port,
|
|
|
9179ba |
proxy_user=self.proxy_user,
|
|
|
9179ba |
@@ -101,6 +107,9 @@ class CPProvider(object):
|
|
|
9179ba |
def get_no_auth_cp(self):
|
|
|
9179ba |
if not self.no_auth_cp:
|
|
|
9179ba |
self.no_auth_cp = connection.UEPConnection(
|
|
|
9179ba |
+ host=self.server_hostname,
|
|
|
9179ba |
+ ssl_port=self.server_port,
|
|
|
9179ba |
+ handler=self.server_prefix,
|
|
|
9179ba |
proxy_hostname=self.proxy_hostname,
|
|
|
9179ba |
proxy_port=self.proxy_port,
|
|
|
9179ba |
proxy_user=self.proxy_user,
|
|
|
9179ba |
diff --git a/src/subscription_manager/managercli.py b/src/subscription_manager/managercli.py
|
|
|
9179ba |
index 286c1ec..5220d49 100644
|
|
|
9179ba |
--- a/src/subscription_manager/managercli.py
|
|
|
9179ba |
+++ b/src/subscription_manager/managercli.py
|
|
|
9179ba |
@@ -347,6 +347,8 @@ class CliCommand(AbstractCLICommand):
|
|
|
9179ba |
cfg.set("server", "port", self.server_port)
|
|
|
9179ba |
cfg.set("server", "prefix", self.server_prefix)
|
|
|
9179ba |
|
|
|
9179ba |
+ if self.server_port:
|
|
|
9179ba |
+ self.server_port = int(self.server_port)
|
|
|
9179ba |
config_changed = True
|
|
|
9179ba |
|
|
|
9179ba |
if hasattr(self.options, "base_url") and self.options.base_url:
|
|
|
9179ba |
diff --git a/subscription-manager.spec b/subscription-manager.spec
|
|
|
9179ba |
index cf294c7..23b0889 100644
|
|
|
9179ba |
--- a/subscription-manager.spec
|
|
|
9179ba |
+++ b/subscription-manager.spec
|
|
|
9179ba |
@@ -14,7 +14,7 @@
|
|
|
9179ba |
|
|
|
9179ba |
Name: subscription-manager
|
|
|
9179ba |
Version: 1.10.14
|
|
|
9179ba |
-Release: 9%{?dist}
|
|
|
9179ba |
+Release: 10%{?dist}
|
|
|
9179ba |
Summary: Tools and libraries for subscription and repository management
|
|
|
9179ba |
Group: System Environment/Base
|
|
|
9179ba |
License: GPLv2
|
|
|
9179ba |
@@ -419,6 +419,10 @@ fi
|
|
|
9179ba |
%endif
|
|
|
9179ba |
|
|
|
9179ba |
%changelog
|
|
|
9179ba |
+* Thu Sep 11 2014 Alex Wood <awood@redhat.com> 1.10.14-10
|
|
|
9179ba |
+- 1131213: Do not ignore server info passed in to cp_provider.
|
|
|
9179ba |
+ (awood@redhat.com)
|
|
|
9179ba |
+
|
|
|
9179ba |
* Wed Jun 04 2014 ckozak <ckozak@redhat.com> 1.10.14-9
|
|
|
9179ba |
- 1104777: Don't rewrite redhat.repo unless it has changed (ckozak@redhat.com)
|
|
|
9179ba |
|