summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Macken <lmacken@redhat.com>2011-11-17 20:33:36 (GMT)
committerLuke Macken <lmacken@redhat.com>2011-11-17 20:34:15 (GMT)
commitd734f7e8956b06ef9bf38cdabda8552a63b186fc (patch)
tree076927c23b9002055a39e6821bd9e9163f93eeff
parentdd28638951b390d54c088073cfe27c9b46022af7 (diff)
downloadfedoracommunity-d734f7e8956b06ef9bf38cdabda8552a63b186fc.zip
fedoracommunity-d734f7e8956b06ef9bf38cdabda8552a63b186fc.tar.gz
fedoracommunity-d734f7e8956b06ef9bf38cdabda8552a63b186fc.tar.xz
Apply a patch from Brennan Ashton to reflect recent Koji rawhide tag changes.
-rw-r--r--fedoracommunity/connectors/bodhiconnector.py2
-rw-r--r--fedoracommunity/connectors/pkgdbconnector.py4
-rw-r--r--fedoracommunity/mokshaapps/packages/controllers/downloads.py8
-rw-r--r--fedoracommunity/mokshaapps/packages/controllers/overview.py2
4 files changed, 9 insertions, 7 deletions
diff --git a/fedoracommunity/connectors/bodhiconnector.py b/fedoracommunity/connectors/bodhiconnector.py
index 8e3a41a..3682762 100644
--- a/fedoracommunity/connectors/bodhiconnector.py
+++ b/fedoracommunity/connectors/bodhiconnector.py
@@ -601,7 +601,7 @@ class BodhiConnector(IConnector, ICall, IQuery):
name = release[1]
row = {'release': name, 'stable_version': 'None',
'testing_version': 'None' }
- if tag == 'dist-rawhide':
+ if tag == 'rawhide':
rawhide_builds = koji.listTagged(tag, package=package,
latest=True, inherit=True)
if rawhide_builds:
diff --git a/fedoracommunity/connectors/pkgdbconnector.py b/fedoracommunity/connectors/pkgdbconnector.py
index 8c50e7b..4566d69 100644
--- a/fedoracommunity/connectors/pkgdbconnector.py
+++ b/fedoracommunity/connectors/pkgdbconnector.py
@@ -162,7 +162,7 @@ class PkgdbConnector(IConnector, ICall, ISearch, IQuery):
d = info[1]['packageListings'][0]
for dist in info[1]['packageListings']:
- if dist['collection']['koji_name'] == 'dist-rawhide':
+ if dist['collection']['koji_name'] == 'rawhide':
d = dist
break
@@ -599,7 +599,7 @@ class PkgdbConnector(IConnector, ICall, ISearch, IQuery):
releases.sort(cmp=lambda x, y: cmp(int(x[1].split()[-1]),
int(y[1].split()[-1])), reverse=True)
if rawhide:
- releases = [('master', 'Rawhide', 'dist-rawhide')] + releases
+ releases = [('master', 'Rawhide', 'rawhide')] + releases
return releases
def get_pkgdb(self):
diff --git a/fedoracommunity/mokshaapps/packages/controllers/downloads.py b/fedoracommunity/mokshaapps/packages/controllers/downloads.py
index 00972a1..d7748ad 100644
--- a/fedoracommunity/mokshaapps/packages/controllers/downloads.py
+++ b/fedoracommunity/mokshaapps/packages/controllers/downloads.py
@@ -50,7 +50,7 @@ class DownloadsDashboard(PackagesDashboardContainer):
layout = [Category('content-col-apps',[
MokshaApp(None,
'fedoracommunity.packages/package/downloads/downloads_table',
- params={'package': '', 'release': 'dist-rawhide'},
+ params={'package': '', 'release': 'rawhide'},
css_class='package_downloads'),
])]
@@ -77,8 +77,10 @@ class DownloadsWidget(Widget):
def update_params(self, d):
super(DownloadsWidget, self).update_params(d)
koji = get_connector('koji')
- rpms = koji._koji_client.getLatestRPMS(d.release, package=d.package)
-
+ if d.release == 'rawhide':
+ rpms = koji._koji_client.getLatestRPMS('dist-rawhide', package=d.package)
+ else:
+ rpms = koji._koji_client.getLatestRPMS(d.release, package=d.package)
arches = defaultdict(list)
for download in rpms[0]:
download['size'] = format_byte_size(download['size'])
diff --git a/fedoracommunity/mokshaapps/packages/controllers/overview.py b/fedoracommunity/mokshaapps/packages/controllers/overview.py
index 01d48e0..5864a33 100644
--- a/fedoracommunity/mokshaapps/packages/controllers/overview.py
+++ b/fedoracommunity/mokshaapps/packages/controllers/overview.py
@@ -52,7 +52,7 @@ class RawhideBuildOwner(ContextAwareWidget):
def update_params(self, d):
super(RawhideBuildOwner, self).update_params(d)
koji = get_connector('koji')
- builds = koji._koji_client.getLatestBuilds('dist-rawhide',
+ builds = koji._koji_client.getLatestBuilds('rawhide',
package=d.package)
d.build = builds[0]['nvr']
pkgdb = get_connector('pkgdb')