bodhi/config/app.cfg | 6 ++++-- bodhi/tools/client.py | 25 ++++++++++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-)
New commits: commit f10dc6948420777f4b5de5dee4f50e8c293c5a97 Author: Luke Macken lmacken@redhat.com Date: Mon Feb 15 20:38:11 2010 +0000
More bodhi client output improvements
diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py index 8db8ed9..0a88816 100755 --- a/bodhi/tools/client.py +++ b/bodhi/tools/client.py @@ -12,10 +12,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Copyright 2007 Red Hat, Inc +# Copyright 2007-2010 Red Hat, Inc # Authors: Luke Macken lmacken@redhat.com
-__version__ = '0.6.0' +__version__ = '0.7.0' __description__ = 'Command line tool for interacting with Bodhi'
import sys @@ -185,7 +185,7 @@ def main(): request=opts.request) log.info(data['tg_flash']) if data.has_key('update'): - log.info(data['update']) + log.info(bodhi.update_str(data['update']))
elif opts.request: verify_args(args) @@ -284,7 +284,7 @@ def main(): if data['tg_flash']: log.info(data['tg_flash']) if data.has_key('update'): - log.info(data['update']) + log.info(bodhi.update_str(data['update']))
elif opts.latest: data = bodhi.latest_builds(package=opts.latest)
commit b19c145c06129baa6baacf43bb5ce9e7c28d0a82 Author: Luke Macken lmacken@redhat.com Date: Mon Feb 15 20:34:53 2010 +0000
Improve some of the output of the bodhi client, as well as code readability
diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py index 77d9a7c..8db8ed9 100755 --- a/bodhi/tools/client.py +++ b/bodhi/tools/client.py @@ -156,6 +156,7 @@ def main(): if 'updates' in data: for update in data['updates']: log.info(bodhi.update_str(update)) + else: verify_args(args) extra_args = { @@ -175,6 +176,7 @@ def main(): if 'updates' in data: for update in data['updates']: log.info(bodhi.update_str(update)) + elif opts.edit: verify_args(args) log.info("Editing update for %s" % args[0]) @@ -184,16 +186,19 @@ def main(): log.info(data['tg_flash']) if data.has_key('update'): log.info(data['update']) + elif opts.request: verify_args(args) data = bodhi.request(update=args[0], request=opts.request) log.info(data['tg_flash']) if data.has_key('update'): - log.info(data['update']) + log.info(bodhi.update_str(data['update'])) + elif opts.delete: verify_args(args) data = bodhi.delete(update=args[0]) log.info(data['tg_flash']) + elif opts.push: data = bodhi.push() if not data: @@ -209,6 +214,7 @@ def main(): data['updates']) fupdates += fdata data['updates'] = fupdates + if opts.push_release: fupdates = [] for prel in opts.push_release: @@ -256,15 +262,19 @@ def main(): params['resume'] = True data = bodhi.send_request('admin/mash', auth=True, req_params=params) log.info(data['tg_flash']) + elif opts.masher: data = bodhi.masher() log.info(data['masher_str']) + elif opts.testable: for update in bodhi.testable(): log.info(bodhi.update_str(update, minimal=opts.verbose)) + elif opts.candidates: for build in bodhi.candidates(): log.info("%-40s %-20s" % (build['nvr'], build['tag_name'])) + elif opts.comment or opts.karma: if not len(args) or not args[0]: log.error("Please specify an update to comment on") @@ -275,6 +285,7 @@ def main(): log.info(data['tg_flash']) if data.has_key('update'): log.info(data['update']) + elif opts.latest: data = bodhi.latest_builds(package=opts.latest) if 'tg_flash' in data: @@ -286,12 +297,14 @@ def main(): y[0].split('-')[1])) for dist, build in data: log.info('%26s %s' % (dist, build)) + elif opts.mine and not args: data = bodhi.query(mine=opts.mine) for update in data['updates']: log.info(bodhi.update_str(update, minimal=True)) log.debug(data) log.info(data['title']) + elif opts.status or opts.bugs or opts.release or opts.type_ or \ opts.mine or args: def print_query(data): @@ -319,6 +332,7 @@ def main(): request=opts.request, mine=opts.mine, limit=opts.limit) print_query(data) + elif opts.download: data = bodhi.query(release=opts.release, status=opts.status, type_=opts.type_, bugs=opts.bugs, @@ -344,6 +358,7 @@ def main(): else: parser.print_help() break + except AuthError: bodhi.password = getpass('Password for %s: ' % opts.username) except ServerError, e:
commit 7b4ab2a933722688f590b3f5b9d98fbb7f878525 Author: Luke Macken lmacken@redhat.com Date: Mon Feb 15 20:18:10 2010 +0000
Update our critpath package list
diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg index 317d7b5..6f52bf2 100644 --- a/bodhi/config/app.cfg +++ b/bodhi/config/app.cfg @@ -152,12 +152,14 @@ 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-20100107/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 compat-db47 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 fedora-setup-keyboard 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 gpgme grep grub grubby gstreamer gstreamer-tools gtk2 gtk2-engines gzip hal 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 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 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 lzma lzma-libs m4 makebootfat mash mcpp mdadm metacity mingetty mobile-broadband-provider-info module-init-tools mpfr mtools mysql-libs nash 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-gdm-hooks plymouth-libs 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 sysvinit-tools tar tcp_wrappers-libs 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-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" +## 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"
# The number of admin approvals it takes to be able to push a critical path # update to stable for a pending release. critpath.num_admin_approvals = 1 + +# The net karma required to submit a critial path update to a pending release) critpath.min_karma = 2
# The commented out values below are the defaults