bodhi/config/f13-updates-testing.mash | 4 ++-- bodhi/jobs.py | 6 +++--- bodhi/static/images/i.gif |binary bodhi/templates/show.kid | 24 +++++++++++++++++++++++- 4 files changed, 28 insertions(+), 6 deletions(-)
New commits: commit 5a91c6aae58ab9634f48d19ac107f04c4d49caec Author: Luke Macken lmacken@redhat.com Date: Thu Aug 26 17:58:01 2010 -0400
Send old_testing nagmail based on the most recent push to testing (#452)
diff --git a/bodhi/jobs.py b/bodhi/jobs.py index d6cda39..0c3984f 100644 --- a/bodhi/jobs.py +++ b/bodhi/jobs.py @@ -78,18 +78,18 @@ def nagmail(): ('old_testing', PackageUpdate.select( AND(PackageUpdate.q.status == 'testing', PackageUpdate.q.request == None)), - lambda update: update.date_pushed), + lambda update: update.days_in_testing), ('old_pending', PackageUpdate.select( AND(PackageUpdate.q.status == 'pending', PackageUpdate.q.request == None)), - lambda update: update.date_submitted), + lambda update: get_age_in_days(update.date_submitted)), ] oldname = None mail_admin = False
for name, query, date in queries: for update in query: - if get_age_in_days(date(update)) > 14: + if date(update) > 14: if update.nagged: if update.nagged.has_key(name) and update.nagged[name]: if (datetime.utcnow() - update.nagged[name]).days < 7:
commit 0c26d975ce3905a39aef902f90c3c48870f5f7fd Author: Luke Macken lmacken@redhat.com Date: Thu Aug 26 16:56:39 2010 -0400
Fix our delta_dirs in our f13-updates-testing.mash config (#440)
diff --git a/bodhi/config/f13-updates-testing.mash b/bodhi/config/f13-updates-testing.mash index 569462e..0df00e1 100644 --- a/bodhi/config/f13-updates-testing.mash +++ b/bodhi/config/f13-updates-testing.mash @@ -15,5 +15,5 @@ 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/ +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/
commit 145fd07acd7b579089ec83aeb3e3b8d9b5bab9b1 Author: Luke Macken lmacken@redhat.com Date: Thu Aug 26 16:37:07 2010 -0400
Add tooltips next to the update 'status' to better explain "what's next" (#423)
diff --git a/bodhi/static/images/i.gif b/bodhi/static/images/i.gif new file mode 100644 index 0000000..79df285 Binary files /dev/null and b/bodhi/static/images/i.gif differ diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid index 0729ec1..855bf77 100644 --- a/bodhi/templates/show.kid +++ b/bodhi/templates/show.kid @@ -7,6 +7,11 @@ <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/> <title>${update.title}</title> + <link rel="stylesheet" href="${tg.url('/static/css/jquery.tooltip.css')}" /> + <script src="${tg.url('/static/js/jquery.dimensions.js')}" type="text/javascript"></script> + <script src="${tg.url('/static/js/jquery.tooltip.js')}" type="text/javascript"></script> + <script src="${tg.url('/static/js/chili-1.7.pack.js')}" type="text/javascript"></script> + <script src="${tg.url('/static/js/jquery.bgiframe.js')}" type="text/javascript"></script> </head>
<?python @@ -45,6 +50,13 @@ if update.karma < 0: karma = -1 elif update.karma > 0: karma = 1 else: karma = 0 karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/karma%d.png' % karma), update.karma) + +statusinfo = { + 'pending': 'Pending - <b>This update has yet to be pushed to a repository. If it has a "testing" request, that means that it is in the queue to be pushed to the updates-testing repository. This process requires a release engineer to sign the packages and manually trigger the push, which usually occurs on a daily basis.</b>', + 'testing': 'Testing - <b>This update is currently in the updates-testing repository. Once it meets the minimum karma or time-in-testing requirements, it can then be pushed to the stable updates repository. If wish to install this update and you do not have the updates-testing repo enabled, you can run `yum --enablerepo=updates-testing install package`.</b>', + 'obsolete': 'Obsolete - <b>This update has been obsoleted by a newer update.</b>', + 'stable': 'Stable - <b>This update has been released to the stable updates repository and is available for all users to install via the standard update mechanisms.</b>', +} ?>
<body> @@ -171,11 +183,11 @@ karma = "<img src="%s" align="top" /> <b>%d</b>" % (tg.url('/static/images/k </center>
<table class="show"> + <tr><td class="title">Status:</td><td class="value">${update.status} <span title="${statusinfo[update.status]}" id="statusinfo"><img src="${tg.url('/static/images/i.gif')}" /></span></td></tr> <tr py:for="field in ( ['Release', XML(release)], ['Update ID', update.updateid], ['Builds', XML(buildinfo)], - ['Status', update.status], ['Requested', update.request], ['Pushed', update.pushed], ['Date Submitted', update.date_submitted], @@ -268,6 +280,16 @@ karma = "<img src="%s" align="top" /> <b>%d</b>" % (tg.url('/static/images/k $(document).ready(function(){ $('#commentform').hide(); $('#addcomment').show(); + + $('#statusinfo').Tooltip({ + event: 'click', + extraClass: "pretty fancy pretty-big fancy-big", + showBody: " - ", + left: 5, + top: -15, + fixPNG: true, + }); + }); </script> </body>