536173 - Build fails when building an uncommited merge "ValueError: too many values to unpack make[1]: *** [platform.ini] Error 1"

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Benjamin Smedberg]

I frequently build merges before committing them to make sure I haven't merged obviously badly. Bug 515792 broke this because `hg parent` returns two parent nodes instead of one and that's unexpected. I think that for now simple quoting will fix this.

Comment 1

[Benjamin Smedberg]

Attachment: Quote the parents for semi-sanity, rev. 1

With this patch you can end up with "SourceStamp=12345567a912 132546b13670" in platform.ini, but that really doesn't bother me for local builds.

Comment 2

[(not currently active) Ted Mielczarek]

Any reason not to just wrap a $(firstword) around that instead?

Comment 3

[Benjamin Smedberg]

Attachment: Use $(firstword), rev. 2 [Checkin: Comment 4]

Comment 4

[Benjamin Smedberg]

http://hg.mozilla.org/mozilla-central/rev/534c88b0e2f9

Comment 5

[Cork]

I still experience this problem with http://hg.mozilla.org/mozilla-central/rev/2ebf3b9ff7d6

Where i encounter this is when i try backing out old checkins. Should i file a new bug for this?

Comment 6

[Dave Townsend [:mossop]]

Reopening per bug 542123

Comment 8

[Cork]

Attachment: Fix additional MOZ_SOURCE_STAMP initialization [Checkin: See comment 13]

/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
only sets the MOZ_SOURCE_STAMP if its not already set, and its first initialization is in /Makefile.in.

This is just a copy of Benjamin's code.

Comment 9

[(not currently active) Ted Mielczarek]

Comment on attachment 424308 [details] [diff] [review]
Fix additional MOZ_SOURCE_STAMP initialization
[Checkin: See comment 13]

Oops, good catch!

Comment 11

[Jason Duell]

Any reason Cork's patch hasn't been checked in?  I just wasted a perfectly nice, embarrassingly large quantum of time running into this issue and figuring it out just to discover it's already solved.

(Am I really the only person who's tried to do a build while merging since 12/09?  I doubt it.  But somehow I just ran into this doing a fairly straightforward m-c -> e10s merge.)

Comment 12

[(not currently active) Ted Mielczarek]

No reason, we just forgot about it.

Comment 13

[(not currently active) Ted Mielczarek]

I had to fix the patch, since I moved that line from Makefile.in to package-name.mk in bug 474610. Pushed to m-c:
http://hg.mozilla.org/mozilla-central/rev/339565aa8cfc

Comment 14

[Serge Gautherie (:sgautherie)]

Any reason not to fix the 2 other cases?
http://mxr.mozilla.org/mozilla-central/search?string=MOZ_SOURCE_STAMP.*%3D+%5C%24&regexp=1&case=1