diff options
| author | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-08-31 13:28:47 +0300 |
|---|---|---|
| committer | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-09-29 08:23:58 +0000 |
| commit | 61acafbd12812679b9da5a109165f66983493964 (patch) | |
| tree | e83db56ccff0760fef6b610e3ea5bc087eea471a /packaging-tools/create_installer.py | |
| parent | 3e01d055325322cbb4fe20b1917baeb0e84a4cf3 (diff) | |
bldinstallercommon: Remove unneeded text file functionsv5.15.11-lts-packaging
It is no longer needed to ensure file endings for text payload
while creating an installer. Remove functions related to this
that are not used for anything else.
Change-Id: Ia2473aba9f2c89dcd118cbe08226e3f681f725b9
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'packaging-tools/create_installer.py')
| -rw-r--r-- | packaging-tools/create_installer.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/packaging-tools/create_installer.py b/packaging-tools/create_installer.py index d3e602f4a..a1e04bd64 100644 --- a/packaging-tools/create_installer.py +++ b/packaging-tools/create_installer.py @@ -48,11 +48,9 @@ from archiveresolver import ArchiveLocationResolver from bld_utils import download, is_linux, is_macos, is_windows from bldinstallercommon import ( copy_tree, - ensure_text_file_endings, extract_file, handle_component_rpath, is_content_url_valid, - is_text_file, locate_executable, locate_path, locate_paths, @@ -371,14 +369,9 @@ def get_component_data( # extract contents if archive.extract_archive == 'yes': extracted = extract_file(downloaded_archive, install_dir) - # remove old package + # remove old package if extraction was successful, else keep it if extracted: os.remove(downloaded_archive) - else: - # ok we could not extract the file, so propably not even archived file, - # check the case if we downloaded a text file, must ensure proper file endings - if is_text_file(downloaded_archive): - ensure_text_file_endings(downloaded_archive) # perform custom action script for the extracted archive if archive.archive_action: |