From 9e261bef7e50b27e272607423a0d343f8feeceb0 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mar 16 2016 19:51:20 +0000 Subject: fix/hack current event date handling this is kinda a bug in wikitcms (I'll fix it there), but we may as well get the date from the compose ID here. --- diff --git a/relvalconsumer.py b/relvalconsumer.py index c6e5d58..b9b19bc 100644 --- a/relvalconsumer.py +++ b/relvalconsumer.py @@ -63,6 +63,9 @@ class RelvalConsumer(fedmsg.consumers.FedmsgConsumer): site = wikitcms.wiki.Wiki(('https', serv), '/w/') site.login() + # some compose info we'll use + (_, date, typ, _) = fedfind.helpers.parse_cid(cid) + # get the validation event instance try: event = site.get_validation_event(cid=cid) @@ -92,7 +95,7 @@ class RelvalConsumer(fedmsg.consumers.FedmsgConsumer): currev = site.current_event if isinstance(event, wikitcms.event.NightlyEvent) and event.release == currev.release: try: - newdate = fedfind.helpers.date_check(event.creation_date, out='obj') + newdate = fedfind.helpers.date_check(date, out='obj') currdate = fedfind.helpers.date_check(currev.creation_date, out='obj') delta = newdate - currdate except ValueError: @@ -170,7 +173,6 @@ class RelvalConsumer(fedmsg.consumers.FedmsgConsumer): difftext = '\nNotable package version changes:\n{0}'.format(diff) else: difftext = '' - typ = fedfind.helpers.parse_cid(cid)[2] nighttmpl = ("""From: rawhide@fedoraproject.org To: {0} Subject: Fedora {1} nightly compose nominated for testing