|
 |
d88f46 |
diff --git a/rel-eng/packages/subscription-manager b/rel-eng/packages/subscription-manager
|
|
|
d88f46 |
index e58ffb0..c1eb58d 100644
|
|
|
d88f46 |
--- a/rel-eng/packages/subscription-manager
|
|
|
d88f46 |
+++ b/rel-eng/packages/subscription-manager
|
|
|
d88f46 |
@@ -1 +1 @@
|
|
|
d88f46 |
-1.15.9-9 ./
|
|
|
d88f46 |
+1.15.9-10 ./
|
|
|
d88f46 |
diff --git a/src/subscription_manager/managercli.py b/src/subscription_manager/managercli.py
|
|
|
d88f46 |
index c23e0d8..b51b383 100644
|
|
|
d88f46 |
--- a/src/subscription_manager/managercli.py
|
|
|
d88f46 |
+++ b/src/subscription_manager/managercli.py
|
|
|
d88f46 |
@@ -1295,7 +1295,10 @@ class RedeemCommand(CliCommand):
|
|
|
d88f46 |
profile_mgr = inj.require(inj.PROFILE_MANAGER)
|
|
|
d88f46 |
profile_mgr.update_check(self.cp, self.identity.uuid)
|
|
|
d88f46 |
|
|
|
d88f46 |
- self.cp.activateMachine(self.identity.uuid, self.options.email, self.options.locale)
|
|
|
d88f46 |
+ # BZ 1248833 Ensure we print out the display message if we get any back
|
|
|
d88f46 |
+ response = self.cp.activateMachine(self.identity.uuid, self.options.email, self.options.locale)
|
|
|
d88f46 |
+ if response and response.get('displayMessage'):
|
|
|
d88f46 |
+ system_exit(0, response.get('displayMessage'))
|
|
|
d88f46 |
|
|
|
d88f46 |
except connection.RestlibException, e:
|
|
|
d88f46 |
#candlepin throws an exception during activateMachine, even for
|
|
|
d88f46 |
diff --git a/subscription-manager.spec b/subscription-manager.spec
|
|
|
d88f46 |
index 04b915a..cd6ac22 100644
|
|
|
d88f46 |
--- a/subscription-manager.spec
|
|
|
d88f46 |
+++ b/subscription-manager.spec
|
|
|
d88f46 |
@@ -49,7 +49,7 @@
|
|
|
d88f46 |
|
|
|
d88f46 |
Name: subscription-manager
|
|
|
d88f46 |
Version: 1.15.9
|
|
|
d88f46 |
-Release: 9%{?dist}
|
|
|
d88f46 |
+Release: 10%{?dist}
|
|
|
d88f46 |
Summary: Tools and libraries for subscription and repository management
|
|
|
d88f46 |
Group: System Environment/Base
|
|
|
d88f46 |
License: GPLv2
|
|
|
d88f46 |
@@ -542,6 +542,10 @@ fi
|
|
|
d88f46 |
%endif
|
|
|
d88f46 |
|
|
|
d88f46 |
%changelog
|
|
|
d88f46 |
+* Fri Sep 11 2015 Chris Rog <crog@redhat.com> 1.15.9-10
|
|
|
d88f46 |
+- 1248833: Ensure the displayMessage is displayed regardless of success or
|
|
|
d88f46 |
+ failure (csnyder@redhat.com)
|
|
|
d88f46 |
+
|
|
|
d88f46 |
* Thu Sep 10 2015 Chris Rog <crog@redhat.com> 1.15.9-9
|
|
|
d88f46 |
- 1261572: Re-initialize() RegisterWidget on RegDialog show
|
|
|
d88f46 |
(alikins@redhat.com)
|