bodhi/controllers.py
by Luke Macken
bodhi/controllers.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit bc9a6278b5e6a99d8d38c79d6662fdafd24948f5
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Feb 18 14:40:35 2010 -0500
Fix another bug related to bug aliases, and adding duplicate comments
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 3b20c0e..ce4207a 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -853,13 +853,13 @@ class Root(controllers.RootController):
# Update any newly added bugs
for bug in bugs:
+ try:
+ bug = int(bug)
+ except ValueError: # bug alias
+ bugzilla = Bugzilla.get_bz()
+ bug = bugzilla.getbug(bug).bug_id
if bug not in original_bugs:
log.debug("Updating newly added bug: %s" % bug)
- try:
- bug = int(bug)
- except ValueError: # bug alias
- bugzilla = Bugzilla.get_bz()
- bug = bugzilla.getbug(bug).bug_id
Bugzilla.byBz_id(bug).add_comment(update,
"%s has been submitted as an update for %s.\n%s" %
(update.title, release.long_name,
14 years, 2 months
bodhi/controllers.py
by Luke Macken
bodhi/controllers.py | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit c5d3ce299a5a662384bafddd9ee95995e4ed71eb
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Feb 18 12:23:45 2010 -0500
Support adding bug aliases to existing updates.
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 08080f3..3b20c0e 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -855,6 +855,11 @@ class Root(controllers.RootController):
for bug in bugs:
if bug not in original_bugs:
log.debug("Updating newly added bug: %s" % bug)
+ try:
+ bug = int(bug)
+ except ValueError: # bug alias
+ bugzilla = Bugzilla.get_bz()
+ bug = bugzilla.getbug(bug).bug_id
Bugzilla.byBz_id(bug).add_comment(update,
"%s has been submitted as an update for %s.\n%s" %
(update.title, release.long_name,
14 years, 2 months
2 commits - bodhi.egg-info/PKG-INFO bodhi.egg-info/SOURCES.txt bodhi/masher.py bodhi.spec
by Luke Macken
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.egg-info/SOURCES.txt | 1 +
bodhi.spec | 2 +-
bodhi/masher.py | 3 ++-
4 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 7f5454fbbfef236527238fcb9a40442860543cb7
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Feb 18 10:12:48 2010 -0500
Bump our spec/release
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index b44e17e..d0e55cc 100644
--- a/bodhi.egg-info/PKG-INFO
+++ b/bodhi.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: bodhi
-Version: 0.7.0
+Version: 0.7.1
Summary: Bodhi is a modular web-system that facilitates the process of publishing updates for a Fedora-based software distribution
Home-page: https://fedorahosted.org/bodhi
Author: Luke Macken
diff --git a/bodhi.egg-info/SOURCES.txt b/bodhi.egg-info/SOURCES.txt
index c579c72..fe7e4d8 100644
--- a/bodhi.egg-info/SOURCES.txt
+++ b/bodhi.egg-info/SOURCES.txt
@@ -49,6 +49,7 @@ bodhi/config/f11-updates-testing.mash
bodhi/config/f11-updates.mash
bodhi/config/f12-updates-testing.mash
bodhi/config/f12-updates.mash
+bodhi/config/f13-updates-testing.mash
bodhi/config/f7-updates-testing.mash
bodhi/config/f7-updates.mash
bodhi/config/f8-updates-testing.mash
diff --git a/bodhi.spec b/bodhi.spec
index 9717faa..76893da 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -3,7 +3,7 @@
Name: bodhi
Version: 0.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
License: GPLv2+
commit c8ac9f7459ec007287e6c2a700effc171a22df63
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Feb 18 10:08:55 2010 -0500
Only mash stable repos for releases that are not locked
diff --git a/bodhi/masher.py b/bodhi/masher.py
index da1fb4f..40a7356 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -360,7 +360,8 @@ class MashTask(Thread):
continue
if self.resume:
- self.repos.add(release.stable_repo)
+ if not release.locked:
+ self.repos.add(release.stable_repo)
self.repos.add(release.testing_repo)
elif update.request == 'stable':
self.repos.add(release.stable_repo)
14 years, 2 months
bodhi/config
by Luke Macken
bodhi/config/app.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9b10c8317f018efdc706729fd8e6cff2527c7c9e
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Feb 18 09:59:13 2010 -0500
Update our critpath list
diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg
index 6f52bf2..3bdf335 100644
--- a/bodhi/config/app.cfg
+++ b/bodhi/config/app.cfg
@@ -152,8 +152,8 @@ tgcaptcha.key = 'Y`h`f&s}TZz'
## Critical Path Packages
##
## Hardcoded, until we can query the pkgdb for it.
-## http://kojipkgs.fedoraproject.org/mash/rawhide-20100214/logs/critpath.txt
-critpath = "ConsoleKit ConsoleKit-libs ConsoleKit-x11 DeviceKit-power GConf2 GConf2-gtk MAKEDEV ModemManager NetworkManager NetworkManager-glib ORBit2 acl alsa-lib anaconda anaconda-yum-plugins at-spi atk attr audit audit-libs authconfig authconfig-gtk avahi avahi-autoipd avahi-glib basesystem bash binutils bluecurve-cursor-theme bzip2 bzip2-libs c-ares ca-certificates cairo checkpolicy chkconfig cloog-ppl comps-extras constantine-backgrounds constantine-backgrounds-single control-center control-center-filesystem coreutils coreutils-libs cpio cpp cracklib cracklib-dicts cracklib-python createrepo cronie cronie-anacron crontabs cryptsetup-luks cryptsetup-luks-libs cups-libs curl cyrus-sasl cyrus-sasl-lib dash db4 db4-utils dbus dbus-glib dbus-libs dbus-python dbus-x11 deltarpm desktop-backgrounds-basic desktop-file-utils device-mapper device-mapper-event device-mapper-event-libs device-mapper-libs dhclient diffutils dmidecode dmraid dmraid-events dnsmasq dosfstools dracut e2fsprogs e2fsprogs-libs efibootmgr eggdbus elfutils elfutils-libelf elfutils-libs ethtool evolution-data-server expat fedora-gnome-theme fedora-icon-theme fedora-logos fedora-release file file-libs filesystem findutils fipscheck fipscheck-lib firstboot flac fontconfig freetype gamin gawk gcc gcc-c++ gdbm gdm genisoimage glib2 glibc glibc-common glibc-devel glibc-headers gmp gnome-desktop gnome-icon-theme gnome-keyring gnome-keyring-pam gnome-menus gnome-panel-libs gnome-python2 gnome-python2-canvas gnome-python2-gnome gnome-python2-gnomevfs gnome-session gnome-settings-daemon gnome-themes gnome-vfs2 gnupg2 gnutls gobject-introspection gpgme grep grub grubby gstreamer gstreamer-tools gtk2 gtk2-engines gzip hal hal-filesystem hal-info hal-libs hdparm hesiod hicolor-icon-theme hostname hwdata info initscripts iptables iptables-ipv6 iputils iscsi-initiator-utils iso-codes isomd5sum jasper-libs kbd kernel kernel-headers keyutils-libs koji kpartx krb5-libs less libICE libIDL libSM libX11 libX11-common libXScrnSaver libXau libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXfont libXft libXi libXinerama libXmu libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86misc libXxf86vm libacl libarchive libart_lgpl libasyncns libattr libblkid libbonobo libbonoboui libcanberra libcanberra-gtk2 libcap libcap-ng libcom_err"
+## http://kojipkgs.fedoraproject.org/mash/rawhide-20100217/logs/critpath.txt
+critpath = "ConsoleKit ConsoleKit-libs ConsoleKit-x11 DeviceKit-power GConf2 GConf2-gtk MAKEDEV ModemManager NetworkManager NetworkManager-glib ORBit2 acl alsa-lib anaconda anaconda-yum-plugins at-spi atk attr audit audit-libs authconfig authconfig-gtk avahi avahi-autoipd avahi-glib basesystem bash binutils bluecurve-cursor-theme bzip2 bzip2-libs c-ares ca-certificates cairo checkpolicy chkconfig cloog-ppl comps-extras constantine-backgrounds constantine-backgrounds-single control-center control-center-filesystem coreutils coreutils-libs cpio cpp cracklib cracklib-dicts cracklib-python createrepo cronie cronie-anacron crontabs cryptsetup-luks cryptsetup-luks-libs cups-libs curl cyrus-sasl cyrus-sasl-lib dash db4 db4-utils dbus dbus-glib dbus-libs dbus-python dbus-x11 deltarpm desktop-backgrounds-basic desktop-file-utils device-mapper device-mapper-event device-mapper-event-libs device-mapper-libs dhclient diffutils dmidecode dmraid dmraid-events dnsmasq dosfstools dracut e2fsprogs e2fsprogs-libs efibootmgr eggdbus elfutils elfutils-libelf elfutils-libs ethtool evolution-data-server expat fedora-gnome-theme fedora-icon-theme fedora-logos fedora-release file file-libs filesystem findutils fipscheck fipscheck-lib firstboot flac fontconfig freetype gamin gawk gcc gcc-c++ gdbm gdm genisoimage glib2 glibc glibc-common glibc-devel glibc-headers gmp gnome-desktop gnome-icon-theme gnome-keyring gnome-keyring-pam gnome-menus gnome-panel-libs gnome-python2 gnome-python2-canvas gnome-python2-gnome gnome-python2-gnomevfs gnome-session gnome-settings-daemon gnome-themes gnome-vfs2 gnupg2 gnutls gobject-introspection gpgme grep grub grubby gstreamer gstreamer-tools gtk2 gtk2-engines gzip hal hal-filesystem hal-info hal-libs hdparm hesiod hicolor-icon-theme hostname hwdata info initscripts iptables iptables-ipv6 iputils iscsi-initiator-utils iso-codes isomd5sum jasper-libs kbd kernel kernel-headers keyutils-libs koji kpartx krb5-libs less libICE libIDL libSM libX11 libX11-common libXScrnSaver libXau libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXfont libXft libXi libXinerama libXmu libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86misc libXxf86vm libacl libarchive libart_lgpl libasyncns libattr libblkid libbonobo libbonoboui libcanberra libcanberra-gtk2 libcap libcap-ng libcom_err libcroco libcurl libdaemon libdrm libedit libffi libfontenc libgail-gnome libgcc libgcrypt libglade2 libgnome libgnome-keyring libgnomecanvas libgnomekbd libgnomeui libgomp libgpg-error libgsf libgudev1 libgweather libical libidn libjpeg libmcpp libnl libnotify libogg libpcap libpciaccess libpng libproxy libproxy-bin libproxy-python librsvg2 libselinux libselinux-python libselinux-utils libsemanage libsepol libsndfile libsoup libss libssh2 libstdc++ libstdc++-devel libtasn1 libtdb libthai libtiff libtool-ltdl libudev libusb libuser libuser-python libutempter libuuid libvorbis libwnck libx86 libxcb libxkbfile libxklavier libxml2 libxml2-python libxslt linux-firmware livecd-tools logrotate lua lvm2 lvm2-libs m4 makebootfat mash mcpp mdadm metacity mingetty mobile-broadband-provider-info module-init-tools mpfr mtools mysql-libs ncurses ncurses-base ncurses-libs net-tools newt newt-python notification-daemon notification-daemon-engine-slider nspr nss nss-softokn nss-softokn-freebl nss-sysinit nss-util ntp ntpdate openldap openssh openssh-clients openssh-server openssl pam pango parted passwd patch pciutils-libs pcre perl perl-Crypt-PasswdMD5 perl-Digest-SHA1 perl-Module-Pluggable perl-Pod-Escapes perl-Pod-Simple perl-libs perl-version pinentry pixman pkgconfig plymouth plymouth-core-libs plymouth-gdm-hooks plymouth-scripts plymouth-utils pm-utils policycoreutils polkit polkit-desktop-policy polkit-gnome popt postfix ppl ppp procmail procps psmisc pth pulseaudio-gdm-hooks pulseaudio-libs pulseaudio-libs-glib2 pungi pyOpenSSL pycairo pygobject2 pygpgme pygtk2 pygtk2-libglade pykickstart pyparted python python-bugzilla python-cryptsetup python-decorator python-deltarpm python-ethtool python-imgcreate python-iniparse python-kid python-krbV python-libs python-meh python-nss python-pyblock python-pycurl python-slip python-urlgrabber pyxf86config radeontool rarian rarian-compat readline redhat-menus redhat-rpm-config repoview rootfiles rpm rpm-build rpm-libs rpm-python rsyslog sed selinux-policy selinux-policy-targeted sendmail setserial setup setuptool sgml-common sgpio shadow-utils shared-mime-info slang sound-theme-freedesktop sqlite squashfs-tools startup-notification sudo sysklogd syslinux system-config-date system-config-firewall-base system-config-keyboard system-config-users system-setup-keyboard sysvinit-tools tar tcp_wrappers-libs tigervnc-server tzdata udev unique unzip upstart usermode usermode-gtk ustr util-linux-ng vbetool vim-minimal which wpa_supplicant xcb-util xdg-utils xkeyboard-config xml-common xorg-x11-drivers xorg-x11-drv-acecad xorg-x11-drv-aiptek xorg-x11-drv-apm xorg-x11-drv-ast xorg-x11-drv-ati xorg-x11-drv-cirrus xorg-x11-drv-dummy xorg-x11-drv-elographics xorg-x11-drv-evdev xorg-x11-drv-fbdev xorg-x11-drv-fpit xorg-x11-drv-geode xorg-x11-drv-glint xorg-x11-drv-hyperpen xorg-x11-drv-i128 xorg-x11-drv-i740 xorg-x11-drv-intel xorg-x11-drv-keyboard xorg-x11-drv-mach64 xorg-x11-drv-mga xorg-x11-drv-mouse xorg-x11-drv-mutouch xorg-x11-drv-neomagic xorg-x11-drv-nouveau xorg-x11-drv-nv xorg-x11-drv-openchrome xorg-x11-drv-penmount xorg-x11-drv-r128 xorg-x11-drv-rendition xorg-x11-drv-s3virge xorg-x11-drv-savage xorg-x11-drv-siliconmotion xorg-x11-drv-sis xorg-x11-drv-sisusb xorg-x11-drv-synaptics xorg-x11-drv-tdfx xorg-x11-drv-trident xorg-x11-drv-v4l xorg-x11-drv-vesa xorg-x11-drv-vmmouse xorg-x11-drv-vmware xorg-x11-drv-void xorg-x11-drv-voodoo xorg-x11-drv-wacom xorg-x11-font-utils xorg-x11-fonts-misc xorg-x11-server-Xorg xorg-x11-server-common xorg-x11-server-utils xorg-x11-xauth xorg-x11-xinit xorg-x11-xkb-utils xz xz-libs yum yum-metadata-parser yum-utils zenity zlib"
# The number of admin approvals it takes to be able to push a critical path
# update to stable for a pending release.
14 years, 2 months
4 commits - bodhi/controllers.py bodhi.egg-info/SOURCES.txt bodhi/metrics.py bodhi/release.py bodhi.spec bodhi/tests
by Luke Macken
bodhi.egg-info/SOURCES.txt | 1 -
bodhi.spec | 8 ++++++--
bodhi/controllers.py | 8 --------
bodhi/metrics.py | 12 +++++++++++-
bodhi/release.py | 2 +-
bodhi/tests/test_controllers.py | 8 +++++++-
6 files changed, 25 insertions(+), 14 deletions(-)
New commits:
commit 408edca0bf67836d40fbccfa3ac93406e0bf10a0
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 16 18:14:43 2010 -0500
Fix our metrics JSON unit test, and add one for our flot widgets too
diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py
index 3b716a1..3df6e2f 100644
--- a/bodhi/tests/test_controllers.py
+++ b/bodhi/tests/test_controllers.py
@@ -1856,7 +1856,13 @@ class TestControllers(testutil.DBTest):
def test_metrics_api(self):
release = create_release()
refresh_metrics()
- testutil.create_request('/updates/metrics?tg_format=json', method='GET')
+ testutil.create_request('/updates/metrics/?tg_format=json', method='GET')
response = simplejson.loads(cherrypy.response.body[0])
assert 'F7' in response
assert response['F7']['TopTestersMetric']['data'] == []
+
+ def test_metrics_html(self):
+ release = create_release()
+ refresh_metrics()
+ testutil.create_request('/updates/metrics/', method='GET')
+ assert 'flot' in cherrypy.response.body[0]
commit 4e09d9794fca24f4614b4fcbd19efde378a19ade
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 16 18:11:13 2010 -0500
0.7.1
diff --git a/bodhi/release.py b/bodhi/release.py
index f8d1b84..b2d74f7 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.7.0'
+VERSION = '0.7.1'
NAME = 'bodhi'
DESCRIPTION = 'Bodhi is a modular web-system that facilitates the process of publishing updates for a Fedora-based software distribution'
AUTHOR = 'Luke Macken'
commit 1d4009ed7c1401f48a1a4c92e3000cb1374f742e
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 16 18:10:42 2010 -0500
Fix a regression in our MetricsController, and add a JSON API
diff --git a/bodhi.egg-info/SOURCES.txt b/bodhi.egg-info/SOURCES.txt
index 60b8600..c579c72 100644
--- a/bodhi.egg-info/SOURCES.txt
+++ b/bodhi.egg-info/SOURCES.txt
@@ -166,7 +166,6 @@ bodhi/tests/__init__.py
bodhi/tests/test_buildsystem.py
bodhi/tests/test_client.py
bodhi/tests/test_controllers.py
-bodhi/tests/test_masher.py
bodhi/tests/test_metadata.py
bodhi/tests/test_model.py
bodhi/tests/test_util.py
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index c6fbd95..08080f3 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -1238,11 +1238,3 @@ class Root(controllers.RootController):
for build in koji.getLatestBuilds(tag, package=package):
builds[tag] = build['nvr']
return builds
-
- @expose(allow_json=True)
- def metrics(self, release=None):
- metrics = {}
- query = release and [Release.byName(release)] or Release.select()
- for release in query:
- metrics[release.name] = release.metrics
- return metrics
diff --git a/bodhi/metrics.py b/bodhi/metrics.py
index a7e504f..00f8c3c 100644
--- a/bodhi/metrics.py
+++ b/bodhi/metrics.py
@@ -21,6 +21,8 @@ from turboflot import TurboFlot
from turbogears import expose, config, flash, redirect
from turbogears.controllers import Controller
+from fedora.tg.util import request_format
+
from bodhi.util import Singleton, get_age_in_days
from bodhi.model import PackageUpdate, Release, hub
@@ -482,8 +484,16 @@ class MetricData(Singleton):
class MetricsController(Controller):
- @expose(template='bodhi.templates.metrics')
+ @expose(template='bodhi.templates.metrics', allow_json=True)
def index(self, release=None):
+ # /updates/metrics?tg_format=json API
+ if request_format() == 'json':
+ json = {}
+ query = release and [Release.byName(release)] or Release.select()
+ for release in query:
+ json[release.name] = release.metrics
+ return json
+
try:
if not release:
rel = Release.select()[0]
commit 8958c0a06774e49fa779aead4fb41783b16f1534
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 16 18:16:07 2010 -0500
Bump our spec file for 0.7.1 (again)
diff --git a/bodhi.spec b/bodhi.spec
index dd50a1e..9717faa 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,8 +2,8 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: bodhi
-Version: 0.7.0
-Release: 6%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
License: GPLv2+
@@ -116,6 +116,10 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Tue Feb 16 2010 Luke Macken <lmacken(a)redhat.com> - 0.7.1-1
+- Fix a regression in our metrics controller, and unvail a new
+ metrics JSON API
+
* Mon Jan 18 2010 Luke Macken <lmacken(a)redhat.com> - 0.7.0-1
- 0.7.0 release, prepping for the F13 release
- Critical Path & No Frozen Rawhide proposals implemented
14 years, 2 months
bodhi.spec
by Luke Macken
bodhi.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8cd55e8a492bac96bc4ad9fb6e317cf04563262c
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 16 08:15:58 2010 -0500
Bump spec
diff --git a/bodhi.spec b/bodhi.spec
index c20a340..dd50a1e 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -3,7 +3,7 @@
Name: bodhi
Version: 0.7.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
License: GPLv2+
14 years, 2 months
bodhi/config
by Luke Macken
bodhi/config/f13-updates-testing.mash | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
New commits:
commit a5f3f9621b517ea85e1698c217e32e7398174ac2
Author: Jesse Keating <jkeating(a)redhat.com>
Date: Tue Feb 16 08:10:44 2010 -0800
Add a config for f13-updates-testing
This will need to get changed when F13 goes GOLD so that we can add the
updates repo as a delta location.
diff --git a/bodhi/config/f13-updates-testing.mash b/bodhi/config/f13-updates-testing.mash
new file mode 100644
index 0000000..569462e
--- /dev/null
+++ b/bodhi/config/f13-updates-testing.mash
@@ -0,0 +1,19 @@
+# mash config file
+
+[f13-updates-testing]
+rpm_path = %(arch)s/
+source_path = SRPMS/
+debuginfo = True
+multilib = True
+multilib_method = devel
+tag = dist-f13-updates-testing
+inherit = False
+strict_keys = True
+keys = E8E40FDE
+repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/13/%(a...
+repoviewtitle = "Fedora 13 Updates Testing - %(arch)s"
+arches = i386 x86_64
+delta = True
+# Enable this once F13 releases
+#delta_dirs = /pub/fedora/linux/releases/13/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f13-updates/%(arch)s/
+delta_dirs = /pub/fedora/linux/development/13/%(arch)s/os/
14 years, 2 months
bodhi.spec
by Luke Macken
bodhi.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 49d2cc26805f851b54db074fc21cf6256eb6a395
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Feb 15 20:34:26 2010 -0500
Spec bump, hopefully the last
diff --git a/bodhi.spec b/bodhi.spec
index e40e5a3..c20a340 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -3,7 +3,7 @@
Name: bodhi
Version: 0.7.0
-Release: 2%{?dist}
+Release: 5%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
License: GPLv2+
14 years, 2 months
bodhi/tests
by Luke Macken
bodhi/tests/test_controllers.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2dc86ed9367142dbc4df0f42f2369dcf0e1faf3d
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 16 05:44:12 2010 +0000
Fix a broken unit test
diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py
index 57c9e34..3b716a1 100644
--- a/bodhi/tests/test_controllers.py
+++ b/bodhi/tests/test_controllers.py
@@ -1460,7 +1460,7 @@ class TestControllers(testutil.DBTest):
testutil.create_request('/updates/request/stable/%s' % params['builds'],
method='POST', headers=session)
log = testutil.get_log()
- assert "Critical path update not yet approved!" in log, log
+ assert "Forcing critical path update into testing" in log, log
update = PackageUpdate.byTitle(params['builds'])
assert update.request == 'testing'
14 years, 2 months
bodhi/model.py
by Luke Macken
bodhi/model.py | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
New commits:
commit 76f5437953e176e8265fa4f29fa32cfdd685230a
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 16 05:42:46 2010 +0000
Remove a lot of unnecessary logic for critical path in PackageUpdate.set_request
diff --git a/bodhi/model.py b/bodhi/model.py
index 1992518..0ec50a9 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -412,27 +412,15 @@ class PackageUpdate(SQLObject):
# [No Frozen Rawhide] Disable pushing critical path updates for
# pending releases directly to stable.
if action == 'stable' and self.release.locked and self.critpath:
- admin_groups = config.get('admin_groups', 'qa releng').split()
- for group in identity.current.groups:
- if group in admin_groups:
- if not self.critpath_approved:
- log.info("Critical path update not yet approved!")
- action = 'testing'
- self.comment('Critical path update approved by %s' % group,
- author=identity.current.user_name)
-# FIXME: even though they are an admin, this update could still not
-# yet be approved...
- mail.send_admin('critpath_approved', self)
- break
- else:
- log.info('Forcing critical path update into testing')
- action = 'testing'
if not self.critpath_approved:
+ action = 'testing'
+ log.info('Forcing critical path update into testing')
notes.append('This critical path update has not '
- 'yet been approved. It must receive '
- '%d positive karma from releng/qa, along '
- 'with %d additional karma from the '
- 'community.' % (
+ 'yet been approved. It must reach a karma '
+ 'of %d, consisting of %d positive karma from '
+ 'releng/qa, along with %d additional karma from '
+ 'the community.' % (
+ config.get('critpath.min_karma'),
config.get('critpath.num_admin_approvals'),
config.get('critpath.min_karma') -
config.get('critpath.num_admin_approvals')))
14 years, 2 months