553776 - Unquoted MOZ_SOURCE_STAMP breaks builds during hg merges

Status: VERIFIED DUPLICATE of bug 536173

(Toolkit Graveyard :: XULRunner, defect)

Description

[Jason Duell]

Attachment: Quote MOZ_SOURCE_STAMP to allow multiple values

The fix for bug 475618 passes an unquoted MOZ_SOURCE_STAMP to the command-line for make-platformini.py.  If "hg parents" returns more than one value (which is the case when doing hg merge), this causes the script to barf:

/usr/bin/python /home/jduell/e10s/t/toolkit/xre/make-platformini.py --buildid=20100319225334 --sourcestamp=500750dc6acc 6c2c8c24ccf8 --sourcerepo=http://hg.mozilla.org/projects/electrolysis /home/jduell/e10s/t/config/milestone.txt > platform.ini
Traceback (most recent call last):
  File "/home/jduell/e10s/t/toolkit/xre/make-platformini.py", line 25, in <module>
    (milestoneFile,) = args
ValueError: too many values to unpack

(the problem is that args=['6c2c8c24ccf8', '/home/jduell/e10s/t/config/milestone.txt'] )

I've attached a patch that "fixes" this by putting the value(s) in quotes.  But I don't know platform.ini well enough to know if this is the right fix (or if we should do something like chop MOZ_SOURCE_STAMP down to one value).

Comment 1

[Cork]

dup bug 536173

Comment 3

[Axel Hecht [:Pike]]

Comment on attachment 433699 [details] [diff] [review]
Quote MOZ_SOURCE_STAMP to allow multiple values

Cancelling review request due to this bug being duped.

Comment 4

[Serge Gautherie (:sgautherie)]

V.Duplicate