--- hooks/post-bodhi-update/watch-bodhi-requests.py | 5 +---- lib/python/repoinfo.py | 6 +++--- repoinfo.conf | 1 + 3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/hooks/post-bodhi-update/watch-bodhi-requests.py b/hooks/post-bodhi-update/watch-bodhi-requests.py index d233a09..b1cdca6 100755 --- a/hooks/post-bodhi-update/watch-bodhi-requests.py +++ b/hooks/post-bodhi-update/watch-bodhi-requests.py @@ -64,10 +64,7 @@ except OSError, e: if e.errno != 17: # already exists raise
-# XXX we should have actual repoinfo data for these -#bodhi_releases = [r['bodhi_release'] for r in repoinfo.repos() -# if 'bodhi_release' in r] -bodhi_releases = ['F11','F12','F13'] +bodhi_releases = repoinfo.getlist('DEFAULT', 'releases') archlist = ('i686', 'x86_64', 'noarch')
# XXX NOTE we could probably be using cPickle or something here, rather than diff --git a/lib/python/repoinfo.py b/lib/python/repoinfo.py index 420becc..2e0296d 100644 --- a/lib/python/repoinfo.py +++ b/lib/python/repoinfo.py @@ -31,18 +31,18 @@ class RepoinfoConfig(object): self.filelist = filelist self.setarch(arch) # implies read()
- def _getlist(self, name, item): + def getlist(self, name, item): itemlist = self.config.get(name, item) if not itemlist: return [] else: return [t.strip() for t in itemlist.split(',')] def getarches(self, name): - return self._getlist(name, 'arches') + return self.getlist(name, 'arches') def getparents(self, name): '''Given a repo name, give the names of its parent repos e.g.: getparents('f13-updates-testing') -> ['f13','f13-updates]''' - return self._getlist(name, 'parents') + return self.getlist(name, 'parents') def getrepo(self, name): '''Given a repo name, return the repoinfo dict, with the keys: 'arches', 'parents', 'tag', 'url', 'path', 'name' ''' diff --git a/repoinfo.conf b/repoinfo.conf index 3241044..cb1817c 100644 --- a/repoinfo.conf +++ b/repoinfo.conf @@ -1,4 +1,5 @@ [DEFAULT] +releases = F12, F13, F14 parents = arches = i386, x86_64, ppc composes =