Merge lp:~cbehrens/openstack-guest-agents/lp811260 into lp:openstack-guest-agents

Proposed by Chris Behrens
Status: Merged
Approved by: Johannes Erdfelt
Approved revision: 81
Merged at revision: 82
Proposed branch: lp:~cbehrens/openstack-guest-agents/lp811260
Merge into: lp:openstack-guest-agents
Diff against target: 16 lines (+1/-2)
1 file modified
unix/commands/redhat/kms.py (+1/-2)
To merge this branch: bzr merge lp:~cbehrens/openstack-guest-agents/lp811260
Reviewer Review Type Date Requested Status
Ozone Pending
Review via email: mp+68611@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Johannes Erdfelt (johannes.erdfelt) wrote :

LGTM!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'unix/commands/redhat/kms.py'
--- unix/commands/redhat/kms.py 2011-06-10 05:52:59 +0000
+++ unix/commands/redhat/kms.py 2011-07-20 21:38:25 +0000
@@ -122,11 +122,10 @@
122 domains = data['domains']122 domains = data['domains']
123123
124 update_files = configure_up2date(domains)124 update_files = configure_up2date(domains)
125 commands.network.update_files(update_files)
125126
126 ret = register_with_rhn(activation_key, profile)127 ret = register_with_rhn(activation_key, profile)
127 if ret:128 if ret:
128 return ret129 return ret
129130
130 commands.network.update_files(update_files)
131
132 return (0, "")131 return (0, "")

Subscribers

People subscribed via source and target branches