diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2012-06-29 09:52:49 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@nokia.com> | 2012-06-29 12:19:10 +0200 |
| commit | 15d19e3fa5b398e13ef970ab302de1410b07b8db (patch) | |
| tree | cb853db24f6d50de5fc2efe41025822d0c0cbff4 /release-tools | |
| parent | caa38d7f27e5fb14b7a0a76c575b00efa0957eac (diff) | |
Fix packaging scripts bug in archive uri resolver.
Fix a bug in archive resolver. Before the archive resolver did not
form the file path correctly when trying to locate local archives from
/data folder.
Change-Id: Icfa3648e1d2d3e72e61dcbb3f3d6d5a129ebc21a
Reviewed-by: Simo Fält <simo.falt@nokia.com>
Diffstat (limited to 'release-tools')
| -rw-r--r-- | release-tools/archiveresolver.py | 5 | ||||
| -rw-r--r-- | release-tools/create_installer.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/release-tools/archiveresolver.py b/release-tools/archiveresolver.py index 1b82899..0f1f4de 100644 --- a/release-tools/archiveresolver.py +++ b/release-tools/archiveresolver.py @@ -67,11 +67,12 @@ class ArchiveLocationResolver: ############################### # Constructor ############################### - def __init__(self, target_config, testclient_mode): + def __init__(self, target_config, testclient_mode, configurations_root_dir): """Init data based on the target configuration""" self.server_list = [] self.pkg_templates_dir = '' self.default_server = None + self.configurations_root_dir = configurations_root_dir # get packages tempalates src dir first self.pkg_templates_dir = os.path.normpath(bldinstallercommon.config_section_map(target_config,'WorkingDirectories')['packages_dir']) server_namespace = os.path.normpath(bldinstallercommon.config_section_map(target_config,'WorkingDirectories')['packages_dir']) @@ -133,7 +134,7 @@ class ArchiveLocationResolver: if os.path.isfile(archive_uri): return archive_uri # 2. check if given archive_uri denotes a package under package templates directory - temp = os.path.normpath(self.pkg_templates_dir + os.sep + package_name + os.sep + 'data' + os.sep + archive_uri) + temp = os.path.normpath(self.configurations_root_dir + os.sep + self.pkg_templates_dir + os.sep + package_name + os.sep + 'data' + os.sep + archive_uri) if os.path.isfile(temp): return temp # 3. check if given URI is valid full URL diff --git a/release-tools/create_installer.py b/release-tools/create_installer.py index 9a39251..2e58e56 100644 --- a/release-tools/create_installer.py +++ b/release-tools/create_installer.py @@ -269,7 +269,7 @@ def init_data(): IFW_TOOLS_DIR = os.path.normpath(IFW_TOOLS_DIR) # init data for archive locator - ARCHIVE_LOCATION_RESOLVER = ArchiveLocationResolver(CONFIG_PARSER_TARGET, TESTCLIENT_MODE) + ARCHIVE_LOCATION_RESOLVER = ArchiveLocationResolver(CONFIG_PARSER_TARGET, TESTCLIENT_MODE, SCRIPT_ROOT_DIR + os.sep + CONFIGURATIONS_DIR) ARCHIVE_LOCATION_RESOLVER.print_server_list() if DUMP_CONFIG: |