Bug 496196 - fix situation when DOWNLOAD_BASE_URL is not set in update snippet generation script - r=ccooper
authorArmen Zambrano Gasparnian <armenzg@mozilla.com
Mon, 10 Aug 2009 17:29:23 -0400
changeset 31296 38a8f988ddf78d3c19ea79d909910f09406185b2
parent 31295 ae9902ccfcda4963c0729202e35a9dda80cf95a9
child 31297 c4dd242192e7bdad936f8ac28cf86da8b4d4fa42
push idunknown
push userunknown
push dateunknown
reviewersccooper
bugs496196
milestone1.9.2a2pre
Bug 496196 - fix situation when DOWNLOAD_BASE_URL is not set in update snippet generation script - r=ccooper
tools/update-packaging/generatesnippet.py
--- a/tools/update-packaging/generatesnippet.py
+++ b/tools/update-packaging/generatesnippet.py
@@ -80,17 +80,17 @@ def main():
     for req, msg in (('marPath', "the absolute path to the where the MAR file is"),
                      ('applicationIniFile', "the absolute path to the application.ini file."),
                      ('locale', "a locale."),
                      ('product', "specify a product.")):
         if not hasattr(options, req):
             parser.error('You must specify %s' % msg)
 
     if not options.downloadBaseURL or options.downloadBaseURL == '':
-        options.downloadBaseURL = 'http://ftp.mozilla.org/pub/mozilla.org/nightly'
+        options.downloadBaseURL = 'http://ftp.mozilla.org/pub/mozilla.org/%s/nightly' % options.product
 
     snippet = generateSnippet(options.marPath,
                               options.applicationIniFile,
                               options.locale,
                               options.downloadBaseURL,
                               options.product)
     f = open(os.path.join(options.marPath, 'complete.update.snippet'), 'wb')
     f.write(snippet)