diff options
| author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2015-10-05 09:52:20 +0300 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@theqtcompany.com> | 2015-10-05 06:55:58 +0000 |
| commit | 525f1270353f93685ffc006be036d7fde3b4ee30 (patch) | |
| tree | 39450d2b6cfd093d47594ed82a3f46cf5f1853fa /packaging-tools/create_installer.py | |
| parent | 3eaedb49124dbee36a8dc65d703cb58e81258bcb (diff) | |
Revert "Use unique filenames for downloaded archives"
Random string ends up in offline/online repository archive
names but not in metadata so it will not work.
This reverts commit eb7e0ccf0df760d3f8d13a146b896297180cd6e5.
Change-Id: I665624516c700dfa328ee46650b892162e50909b
Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
Diffstat (limited to 'packaging-tools/create_installer.py')
| -rw-r--r-- | packaging-tools/create_installer.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/packaging-tools/create_installer.py b/packaging-tools/create_installer.py index e65f2041f..91174dd98 100644 --- a/packaging-tools/create_installer.py +++ b/packaging-tools/create_installer.py @@ -47,8 +47,6 @@ import os import shutil import sys import re -import random -import string from time import gmtime, strftime from optparse import OptionParser, Option import multiprocessing # to get the cpu core count @@ -801,10 +799,6 @@ def get_component_data(sdk_component, archive, install_dir, data_dir_dest, compr if not archive.package_strip_dirs: archive.package_strip_dirs = '0' - # Some archives to be downloaded may have same filenames and those archives will be saved to tmp - # directory before final installer creation. Ensure that the temporary archive names on the disk - # get unique filenames - random_temp_archive_prefix = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(8)) if package_raw_name.endswith('.7z') \ and archive.package_strip_dirs == '0' \ and not archive.package_finalize_items \ @@ -812,12 +806,12 @@ def get_component_data(sdk_component, archive, install_dir, data_dir_dest, compr and sdk_component.target_install_base == '/' \ and package_raw_name == archive.archive_name: print ' No repackaging actions required for the package, just download it directly to data directory' - downloadedArchive = os.path.join(data_dir_dest, random_temp_archive_prefix + "_" + package_raw_name) + downloadedArchive = os.path.normpath(data_dir_dest + os.sep + package_raw_name) # start download bld_utils.download(archive.archive_uri, downloadedArchive) return - downloadedArchive = os.path.join(install_dir, random_temp_archive_prefix + "_" + package_raw_name) + downloadedArchive = os.path.normpath(install_dir + os.sep + package_raw_name) # start download bld_utils.download(archive.archive_uri, downloadedArchive) |