cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #14712 from chouseknecht/galaxy2_paging

Browse source 
Fix bug 14715: Galaxy CLI paging error
This commit is contained in:
Brian Coca 2016-02-29 22:47:57 -05:00
commit 0d1138e0a0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/galaxy/api.py
View file

@ -180,12 +180,12 @@ class GalaxyAPI(object):
url = '%s/roles/%d/%s/?page_size=50' % (self.baseurl, int(role_id), related)
data = self.__call_galaxy(url)
results = data['results']
done = (data.get('next', None) is None)
done = (data.get('next_link', None) is None)
while not done:
url = '%s%s' % (self.baseurl, data['next'])
url = '%s%s' % (self._api_server, data['next_link'])
data = self.__call_galaxy(url)
results += data['results']
done = (data.get('next', None) is None)
done = (data.get('next_link', None) is None)
return results
except:
return None
@ -203,12 +203,12 @@ class GalaxyAPI(object):
results = data
done = True
if "next" in data:
done = (data.get('next', None) is None)
done = (data.get('next_link', None) is None)
while not done:
url = '%s%s' % (self.baseurl, data['next'])
url = '%s%s' % (self._api_server, data['next_link'])
data = self.__call_galaxy(url)
results += data['results']
done = (data.get('next', None) is None)
done = (data.get('next_link', None) is None)
return results
except Exception as error:
raise AnsibleError("Failed to download the %s list: %s" % (what, str(error)))