Merge branch 'devel' of https://github.com/pieteravonts/ansible into pieteravonts-devel

pull/4190/head
James Cammarata 11 years ago
commit 7272aa0347

@ -89,7 +89,10 @@ def unsubscribe_channels(channels, client, session, sysname, sys_id):
def base_channels(client, session, sys_id): def base_channels(client, session, sys_id):
basechan = client.channel.software.listSystemChannels(session, sys_id) basechan = client.channel.software.listSystemChannels(session, sys_id)
chans = [item['channel_label'] for item in basechan] try:
chans = [item['label'] for item in basechan]
except KeyError:
chans = [item['channel_label'] for item in basechan]
return chans return chans
# ------------------------------------------------------- # # ------------------------------------------------------- #

Loading…
Cancel
Save