Bug 1455127 - Remove --package from upload.py; r=ted
☠☠ backed out by 46ea55337b33 ☠ ☠
authorGregory Szorc <gps@mozilla.com>
Wed, 18 Apr 2018 15:04:53 -0700
changeset 467932 ac17015816ca21649f102f50038a20a81b03babe
parent 467931 8527e727b92d660afa7c529069ebf26a4127a046
child 467933 43c22d224c0ba4cb4f890a37a5e04d6bb2b80c25
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1455127
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1455127 - Remove --package from upload.py; r=ted The argument is never used in the local file copying function. So let's nuke the argument. MozReview-Commit-ID: JeU4LaVvGD7
build/upload.py
toolkit/mozapps/installer/packager.mk
--- a/build/upload.py
+++ b/build/upload.py
@@ -51,17 +51,17 @@ def GetBaseRelativePath(path, local_file
     full remote path to place the file in. If base_path is not None, include
     the relative path from base_path to file."""
     dir = os.path.dirname(local_file)
     # strip base_path + extra slash and make it unixy
     dir = dir[len(base_path) + 1:].replace('\\', '/')
     return path + dir
 
 
-def CopyFilesLocally(path, files, verbose=False, base_path=None, package=None):
+def CopyFilesLocally(path, files, verbose=False, base_path=None):
     """Copy each file in the list of files to `path`.  The `base_path` argument is treated
     as it is by UploadFiles."""
     if not path.endswith("/"):
         path += "/"
     if base_path is not None:
         base_path = os.path.abspath(base_path)
     for file in files:
         file = os.path.abspath(file)
@@ -83,23 +83,19 @@ if __name__ == '__main__':
         if path is not None:
             path = FixupMsysPath(path)
 
     parser = OptionParser(usage="usage: %prog [options] <files>")
     parser.add_option("-b", "--base-path",
                       action="store",
                       help="Preserve file paths relative to this path when uploading. "
                       "If unset, all files will be uploaded directly to UPLOAD_PATH.")
-    parser.add_option("--package",
-                      action="store",
-                      help="Name of the main package.")
     (options, args) = parser.parse_args()
     if len(args) < 1:
         print("You must specify at least one file to upload")
         sys.exit(1)
 
     try:
         CopyFilesLocally(path, args, base_path=options.base_path,
-                         package=options.package,
                          verbose=True)
     except IOError as strerror:
         print(strerror)
         sys.exit(1)
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -146,17 +146,16 @@ checksum:
 	@echo 'CHECKSUM FILE START'
 	@cat $(CHECKSUM_FILE)
 	@echo 'CHECKSUM FILE END'
 	$(SIGN_CHECKSUM_CMD)
 
 
 upload: checksum
 	$(PYTHON) -u $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) \
-		--package '$(PACKAGE)' \
 		$(UPLOAD_FILES) \
 		$(CHECKSUM_FILES)
 
 # source-package creates a source tarball from the files in MOZ_PKG_SRCDIR,
 # which is either set to a clean checkout or defaults to $topsrcdir
 source-package:
 	@echo 'Generate the sourcestamp file'
 	# Make sure to have repository information available and then generate the