Use regular string ops, instead of urlparse.urljoin.

prebuilt.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import datetime
 import multiprocessing
 import optparse
 import os
 import re
 import sys
 import tempfile
 import time
-import urlparse
 
 from chromite.lib import cros_build_lib
 from chromite.lib.binpkg import (GrabLocalPackageIndex, GrabRemotePackageIndex,
                                  PackageIndex)
 """
 This script is used to upload host prebuilts as well as board BINHOSTS.
 
 If the URL starts with 'gs://', we upload using gsutil to Google Storage.
 Otherwise, rsync is used.
 
@@ skipping 285 matching lines @@
     pkgs: The packages to upload.
 
   Returns:
     Returns a dictionary of local_path/remote_path pairs
   """
   upload_files = {}
   for pkg in pkgs:
     suffix = pkg['CPV'] + '.tbz2'
     local_path = os.path.join(base_local_path, suffix)
     assert os.path.exists(local_path)
-    remote_path = urlparse.urljoin(base_remote_path, suffix)
+    remote_path = '%s/%s' % (base_remote_path.rstrip('/'), suffix)
     upload_files[local_path] = remote_path
 
   return upload_files
 
 
 def DetermineMakeConfFile(target):
   """Determine the make.conf file that needs to be updated for prebuilts.
 
     Args:
       target: String representation of the board. This includes host and board
@@ skipping 77 matching lines @@
     binhost_conf = os.path.join(build_path, _BINHOST_CONF_DIR, 'host',
         '%s.conf' % _HOST_TARGET)
   else:
     board_path = os.path.join(build_path, _BOARD_PATH % {'board': board})
     package_path = os.path.join(board_path, 'packages')
     package_string = board
     url_suffix = _REL_BOARD_PATH % {'board': board, 'version': version}
     git_file = os.path.join(build_path, DetermineMakeConfFile(board))
     binhost_conf = os.path.join(build_path, _BINHOST_CONF_DIR, 'target',
         '%s.conf' % board)
-  remote_location = urlparse.urljoin(upload_location, url_suffix)
+  remote_location = '%s/%s' % (upload_location.rstrip('/'), url_suffix)
 
   # Process Packages file, removing duplicates and filtered packages.
   pkg_index = GrabLocalPackageIndex(package_path)
   pkg_index.SetUploadLocation(binhost_base_url, url_suffix)
   pkg_index.RemoveFilteredPackages(lambda pkg: ShouldFilterPackage(pkg))
   uploads = pkg_index.ResolveDuplicateUploads(pkg_indexes)
 
   # Write Packages file.
   tmp_packages_file = pkg_index.WriteToNamedTemporaryFile()
 
   if upload_location.startswith('gs://'):
     # Build list of files to upload.
     upload_files = GenerateUploadDict(package_path, remote_location, uploads)
-    remote_file = urlparse.urljoin(remote_location, 'Packages')
+    remote_file = '%s/Packages' % remote_location.rstrip('/')
     upload_files[tmp_packages_file.name] = remote_file
 
     print 'Uploading %s' % package_string
     failed_uploads = RemoteUpload(upload_files)
     if len(failed_uploads) > 1 or (None not in failed_uploads):
       error_msg = ['%s -> %s\n' % args for args in failed_uploads]
       raise UploadFailed('Error uploading:\n%s' % error_msg)
   else:
     pkgs = ' '.join(p['CPV'] + '.tbz2' for p in uploads)
     ssh_server, remote_path = remote_location.split(':', 1)
@@ skipping 90 matching lines @@
   if options.board:
     UploadPrebuilt(options.build_path, options.upload, version,
                    options.binhost_base_url, board=options.board,
                    git_sync=options.git_sync, key=options.key,
                    pkg_indexes=pkg_indexes,
                    sync_binhost_conf=options.sync_binhost_conf)
 
 
 if __name__ == '__main__':
   main()