generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing resources script on Windows

Browse Source 
Invalid concatenation of the URL to the download file made it fail downloading on Windows.

Review URL: http://webrtc-codereview.appspot.com/290003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1005 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2011-11-23 15:24:44 +00:00
parent c4c56ed20b
commit 3379b0cf85
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/resources/update.py
View File

@ -12,6 +12,7 @@ __author__ = 'kjellander@webrtc.org (Henrik Kjellander)'
"""Downloads WebRTC resources files from a remote host.""" """Downloads WebRTC resources files from a remote host."""
from optparse import OptionParser from optparse import OptionParser
from urlparse import urljoin
import os import os
import shutil import shutil
import sys import sys
@ -31,7 +32,7 @@ def main():
""" """
# Constants # Constants
deps_key = 'webrtc_resources_revision' deps_key = 'webrtc_resources_revision'
remote_url_base = 'http://commondatastorage.googleapis.com/webrtc-resources' remote_url_base = 'http://commondatastorage.googleapis.com/webrtc-resources/'
version_filename = 'webrtc-resources-version' version_filename = 'webrtc-resources-version'
filename_prefix = 'webrtc-resources-' filename_prefix = 'webrtc-resources-'
extension = '.tgz' extension = '.tgz'
@ -69,7 +70,7 @@ def main():
if latest_version > current_version or options.force: if latest_version > current_version or options.force:
temp_dir = tempfile.mkdtemp(prefix='webrtc-resources-') temp_dir = tempfile.mkdtemp(prefix='webrtc-resources-')
archive_name = '%s%s%s' % (filename_prefix, latest_version, extension) archive_name = '%s%s%s' % (filename_prefix, latest_version, extension)
remote_archive_url = os.path.join(remote_url_base, archive_name) remote_archive_url = urljoin(remote_url_base, archive_name)
# Download into the temporary directory with display of progress, inspired # Download into the temporary directory with display of progress, inspired
# by the Stack Overflow post at http://goo.gl/JIrbo # by the Stack Overflow post at http://goo.gl/JIrbo
temp_file = os.path.join(temp_dir, archive_name) temp_file = os.path.join(temp_dir, archive_name)