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