Bug 536173 - Build fails when building platform.ini with an uncommitted merge: "ValueError: too many values to unpack", r=ted
authorBenjamin Smedberg <benjamin@smedbergs.us>
Wed, 06 Jan 2010 11:59:44 -0500
changeset 36882 534c88b0e2f98fe548b7f0d6bdce5b06524eed93
parent 36881 b222b5207f6990fea8a4e44543800103924e9c85
child 36883 195c956764ce8b2967f7a30ec6951c634d9a822d
push idunknown
push userunknown
push dateunknown
reviewersted
bugs536173
milestone1.9.3a1pre
Bug 536173 - Build fails when building platform.ini with an uncommitted merge: "ValueError: too many values to unpack", r=ted
toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -214,17 +214,17 @@ DEFINES		+= -DWRAP_SYSTEM_INCLUDES
 endif
 
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(findstring lib64,$(libdir)))
 DEFINES     += -DHAVE_USR_LIB64_DIR
 endif
 endif
 
-MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)
+MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
 # strip a trailing slash from the repo URL because it's not always present,
 # and we want to construct a working URL in buildconfig.html
 # make+shell+sed = awful
 _dollar=$$
 SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
 
 ifdef MOZ_SOURCE_STAMP
 INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP)