broken build (Was: /hg/icedtea6: 6 new changesets)

[Mark Wielaard]

On Fri, 2010-07-30 at 01:15 +0200, Mark Wielaard wrote:
> On Thu, 2010-07-29 at 21:55 +0100, Dr Andrew John Hughes wrote:
> > On 14:34 Thu 29 Jul     , Omair Majid wrote:
> > > > There don't seem to be any problems building anyway.
> > > 
> > > Yup, I can confirm. Even though there are tons of files listed, they 
> > > seem to refer to stuff that was merged. The build works just fine.
> 
> Sadly it seems something did break. The auto-builder just informed me:
> http://icedtea.classpath.org/pipermail/testresults/2010-July/000672.html
> 
> It only seems to impact older setups that trigger the QNAME workaround
> patch. I cannot immediately see how my commit/merge broke that. But will
> try to fix it tomorrow. Slightly scared my fix/merging will make it
> worse though. So first some sleep to get a clear head.

I still don't really understand how it happened. But I found out what
went wrong with the merge. It reintroduced an old patch that was
replaced with a new one and duplicated the testing/patching of the
source. Hopefully fixed with the attached commit.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: deduplicate-merge.patch
Type: text/x-patch
Size: 2735 bytes
Desc: 
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100730/9322c728/deduplicate-merge.patch