bug 1153799 - Stop using SSH symbol upload when using Socorro API. r=gps
authorTed Mielczarek <ted@mielczarek.org>
Fri, 24 Apr 2015 06:41:56 -0400
changeset 242811 67f9e438210c902f60c806b6216c6d347b2c4550
parent 242810 e52ad706452255d3db345de67fc0d348d81c19b5
child 242812 be86aaa6bd75ec0d054587625d52dc839fb81509
push id12802
push userkwierso@gmail.com
push dateThu, 07 May 2015 22:38:36 +0000
treeherderfx-team@b9d40b34df46 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1153799
milestone40.0a1
bug 1153799 - Stop using SSH symbol upload when using Socorro API. r=gps
Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -250,18 +250,19 @@ ifdef MOZ_CRASHREPORTER
 	cd $(DIST)/crashreporter-symbols && \
           zip -r9D '../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' . -i '*.sym' -i '*.txt'  -x '*test*' -x '*Test*'
 endif # MOZ_CRASHREPORTER
 
 uploadsymbols:
 ifdef MOZ_CRASHREPORTER
 ifdef SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
 	$(PYTHON) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.py '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
+else
+	$(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh $(SYMBOL_INDEX_NAME) '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
 endif
-	$(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh $(SYMBOL_INDEX_NAME) '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
 endif
 
 # MOZ_SOURCE_STAMP is defined in package-name.mk with a deferred assignment.
 # exporting it makes make run its $(shell) command for each invoked submake,
 # so transform it to an immediate assignment.
 MOZ_SOURCE_STAMP := $(MOZ_SOURCE_STAMP)
 export MOZ_SOURCE_STAMP
 endif