aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/sdkcomponent.py
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2014-03-05 14:31:47 +0200
committerIikka Eklund <iikka.eklund@digia.com>2014-03-05 13:38:10 +0100
commita8ee8252db606c4a46484e1bb4b539e86eab403a (patch)
treef63bbcd25971f216f3c31827336a7772e4d84fc6 /packaging-tools/sdkcomponent.py
parent304bf4dbb9db974fef366f91244551731ad6d514 (diff)
Fix multi line archive parsing in packaging scripts
With Python 2.7 the "replace(os.linesep, '')" seems to be broken on Windows. Replace with version that works on all platforms. Change-Id: Iad9f7812a20c0cc1f8de4b688e4ea999373ebcb0 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Diffstat (limited to 'packaging-tools/sdkcomponent.py')
-rw-r--r--packaging-tools/sdkcomponent.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging-tools/sdkcomponent.py b/packaging-tools/sdkcomponent.py
index 3423fdf91..361f32e29 100644
--- a/packaging-tools/sdkcomponent.py
+++ b/packaging-tools/sdkcomponent.py
@@ -94,7 +94,7 @@ class SdkComponent:
self.package_name = section_name
self.packages_full_path_list = packages_full_path_list
self.archives = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'archives')
- self.archives = self.archives.replace(' ', '').replace(os.linesep, '')
+ self.archives = self.archives.replace(' ', '').replace('\n', '')
self.archive_server_name = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'archive_server_name')
self.downloadable_archive_list = []
self.target_install_base = bldinstallercommon.safe_config_key_fetch(target_config, section_name, 'target_install_base')