backend/server/importlib/backend.py | 5 +++++ 1 file changed, 5 insertions(+)
New commits: commit aba90a67ac0a9f1c5cd78792a8e26718af579bea Author: Pradeep Kilambi pkilambi@redhat.com Date: Thu Jul 23 14:21:11 2009 -0400
513432, 513435 : Our channel family import is written such that we compare and resync the red hat channel families. But in iss case we can have provate channel family ties to a channel ebing imported that will not match whats on the slave as slaves default to org 1. This fix should only post process the channel families if its a non custom one.
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py index fdb737d..39d65f9 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -905,6 +905,11 @@ class Backend: cf_ids = [] c_ids = [] for cf in channel_families: + if 'private-channel-family' in cf['label']: + # Its a private channel family and channel family members + # will be different from server as this is most likely ISS + # sync. Don't compare and delete custom channel families. + continue for cid in cf['channel_ids']: # Look up channel families for this channel h_lookup_cfid.execute(channel_id=cid)
spacewalk-commits@lists.fedorahosted.org