|
 |
9179ba |
diff --git a/rel-eng/packages/subscription-manager b/rel-eng/packages/subscription-manager
|
|
|
9179ba |
index 00b1473..e70e94b 100644
|
|
|
9179ba |
--- a/rel-eng/packages/subscription-manager
|
|
|
9179ba |
+++ b/rel-eng/packages/subscription-manager
|
|
|
9179ba |
@@ -1 +1 @@
|
|
|
9179ba |
-1.10.14-10 ./
|
|
|
9179ba |
+1.10.14-11 ./
|
|
|
9179ba |
diff --git a/src/subscription_manager/cache.py b/src/subscription_manager/cache.py
|
|
|
9179ba |
index 298f64e..d160dbc 100644
|
|
|
9179ba |
--- a/src/subscription_manager/cache.py
|
|
|
9179ba |
+++ b/src/subscription_manager/cache.py
|
|
|
9179ba |
@@ -223,25 +223,20 @@ class StatusCache(CacheManager):
|
|
|
9179ba |
# which does not have the necessary API call.
|
|
|
9179ba |
self.last_error = ex
|
|
|
9179ba |
return None
|
|
|
9179ba |
-
|
|
|
9179ba |
- # If we hit a network error, but no cache exists (extremely unlikely)
|
|
|
9179ba |
- # then we are disconnected
|
|
|
9179ba |
- except socket.error, ex:
|
|
|
9179ba |
+ except connection.AuthenticationException, ex:
|
|
|
9179ba |
+ log.error("Could not authenticate with server, check registration status.")
|
|
|
9179ba |
log.exception(ex)
|
|
|
9179ba |
self.last_error = ex
|
|
|
9179ba |
- if not self._cache_exists():
|
|
|
9179ba |
- log.error("Server unreachable, registered, but no cache exists.")
|
|
|
9179ba |
- return None
|
|
|
9179ba |
-
|
|
|
9179ba |
- log.warn("Unable to reach server, using cached status.")
|
|
|
9179ba |
- return self._read_cache()
|
|
|
9179ba |
+ return None
|
|
|
9179ba |
+ except (connection.RemoteServerException,
|
|
|
9179ba |
+ connection.NetworkException,
|
|
|
9179ba |
+ socket.error), ex:
|
|
|
9179ba |
|
|
|
9179ba |
- except connection.NetworkException, ex:
|
|
|
9179ba |
- log.exception(ex)
|
|
|
9179ba |
+ log.error(ex)
|
|
|
9179ba |
self.last_error = ex
|
|
|
9179ba |
if not self._cache_exists():
|
|
|
9179ba |
log.error("Server unreachable, registered, but no cache exists.")
|
|
|
9179ba |
- raise
|
|
|
9179ba |
+ return None
|
|
|
9179ba |
|
|
|
9179ba |
log.warn("Unable to reach server, using cached status.")
|
|
|
9179ba |
return self._read_cache()
|
|
|
9179ba |
@@ -250,11 +245,6 @@ class StatusCache(CacheManager):
|
|
|
9179ba |
self.last_error = ex
|
|
|
9179ba |
log.error("Bad identity, unable to connect to server")
|
|
|
9179ba |
return None
|
|
|
9179ba |
- except connection.AuthenticationException, ex:
|
|
|
9179ba |
- log.error("Could not authenticate with server, check registration status.")
|
|
|
9179ba |
- log.exception(ex)
|
|
|
9179ba |
- self.last_error = ex
|
|
|
9179ba |
- return None
|
|
|
9179ba |
|
|
|
9179ba |
def to_dict(self):
|
|
|
9179ba |
return self.server_status
|
|
|
9179ba |
diff --git a/subscription-manager.spec b/subscription-manager.spec
|
|
|
9179ba |
index 23b0889..6a3cad1 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: 10%{?dist}
|
|
|
9179ba |
+Release: 11%{?dist}
|
|
|
9179ba |
Summary: Tools and libraries for subscription and repository management
|
|
|
9179ba |
Group: System Environment/Base
|
|
|
9179ba |
License: GPLv2
|
|
|
9179ba |
@@ -419,6 +419,9 @@ fi
|
|
|
9179ba |
%endif
|
|
|
9179ba |
|
|
|
9179ba |
%changelog
|
|
|
9179ba |
+* Mon Nov 24 2014 Devan Goodwin <dgoodwin@rm-rf.ca> 1.10.14-11
|
|
|
9179ba |
+- 1113741: Fix rhsmd traceback on 502 errors. (alikins@redhat.com)
|
|
|
9179ba |
+
|
|
|
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)
|