Good find. I've moved the files to a dir in my home dir
/home/kmcgrail/conflict-2019-04-30/ -rw-rw-r-- 1 automc automc 14679 Apr 30 18:00 active.list -rw-rw-r-- 1 automc automc 14462 Feb 28 08:31 active.list.mine -rw-rw-r-- 1 automc automc 15051 Feb 28 08:31 active.list.r1854447 -rw-rw-r-- 1 automc automc 15052 Feb 28 08:31 active.list.r1854508 I then reverted active.list and expect tonight it should run ok... On 4/30/2019 1:21 PM, Paul Stead wrote: > I've found the nightly cron output: > > https://lists.apache.org/thread.html/e4723655cd8ed1101e5911b3d9ba8682b3f25c0ad52db4202ed72366@%3Csysadmins.spamassassin.apache.org%3E > > ... > + svn commit -m 'promotions validated' rules/active.list > svn: E155015: Commit failed (details follow): > svn: E155015: Aborting commit: > '/usr/local/spamassassin/automc/svn/trunk/rules/active.list' remains > in conflict > + /usr/bin/perl masses/rule-qa/list-bad-rules > ... > > > There's a conflict on the svn, cleaning up the repo might be all it needs > > On Tue, 30 Apr 2019 at 18:13, Paul Stead <[email protected]> wrote: > >> Hmm - still no updates. It seems that the affected lines are in >> >> build/mkupdates/run_nightly >> >> Line 23-28 is where it looks like the commit happens - line 23 has an >> output file that does seem to be being updated if the HTTP date is to be >> trusted (it's changed the last two days): >> >> https://ruleqa.spamassassin.org/reports/LATEST >> >> So I think I've found the problematic line - I don't have any access to >> the infra for ruleqa - does anyone have the ability to give the box a poke? >> I'd also be happy to look at this if required and access could be provided? >> >> >> Paul >> >> On Mon, 29 Apr 2019 at 17:15, Giovanni Bechis <[email protected]> wrote: >> >>> On 4/29/19 6:01 PM, Paul Stead wrote: >>>> Hiya, >>>> >>>> I've had my eye on some rules in QA over the last few months, rules >>> I've expected to be promoted haven't been. >>>> I notice that >>> http://svn.apache.org/viewvc/spamassassin/trunk/rules/active.list?view=log >>> stopped being updated since Wed Feb 27 08:30:20 2019 UTC >>>> Does this look right? >>>> >>> No, >>> and the latest commit to build/mkrules has been done on 2019-02-26 >>> 01:13:11 +0100 >>> >>> Giovanni >>> -- Kevin A. McGrail Member, Apache Software Foundation Chair Emeritus Apache SpamAssassin Project https://www.linkedin.com/in/kmcgrail - 703.798.0171
