java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 12 +++++----- 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit 085e6b0eb88ea827f59f2dee44cbf433f93a09e4 Author: Jan Dobes jdobes@redhat.com Date: Thu Nov 21 15:12:14 2013 +0100
1009875 - changing order of operations
diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java index 9b7949e..458a3a3 100644 --- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java +++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java @@ -125,6 +125,12 @@ public class MigrationManager extends BaseManager { throw new PermissionException(RoleFactory.ORG_ADMIN); }
+ // Unsubscribe from all channels to change channel entitlements + UpdateChildChannelsCommand cmd = new UpdateChildChannelsCommand(user, server, + new ArrayList()); + cmd.store(); + SystemManager.unsubscribeServerFromChannel(server, server.getBaseChannel()); + // Remove from all system groups: ServerGroupManager manager = ServerGroupManager.getInstance(); for (ManagedServerGroup group : server.getManagedGroups()) { @@ -174,12 +180,6 @@ public class MigrationManager extends BaseManager { } }
- // Unsubscribe from all channels to change channel entitlements - UpdateChildChannelsCommand cmd = new UpdateChildChannelsCommand(user, server, - new ArrayList()); - cmd.store(); - SystemManager.unsubscribeServerFromChannel(server, server.getBaseChannel()); - SystemManager.removeAllServerEntitlements(server.getId()); }
spacewalk-commits@lists.fedorahosted.org