diff options
| author | Antti Kokko <antti.kokko@qt.io> | 2019-04-10 15:54:31 +0300 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@qt.io> | 2019-05-03 05:52:08 +0000 |
| commit | d32778d89032f90a913d009b6ef75cc8773a555d (patch) | |
| tree | 1f571ce60e41cf6ddb99ba03cdfb0dfeee4e300e | |
| parent | cbc711a6f851902ad031c868717382a39d30f497 (diff) | |
Fix wrong package path when updating online repository
This fix is continuation to change that fixed error
"scp: error: unexpected filename ." seen in online repository
builds. This was caused by change in OpenSSH server code
due to a security vulnerability CVE-2018-20685.
Change-Id: Ib0cc9611d4213fe64bc35d98451fa29ed77d367e
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | packaging-tools/update_repository.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packaging-tools/update_repository.py b/packaging-tools/update_repository.py index ad781431b..d1d423d54 100644 --- a/packaging-tools/update_repository.py +++ b/packaging-tools/update_repository.py @@ -331,12 +331,13 @@ if __name__ == "__main__": else: COMPONENTS_TO_UPDATE = parse_components_from_argument(CALLER_ARGUMENTS) # sanity check + source_pkg_path = os.path.join(CALLER_ARGUMENTS.source_pkg, 'pkg') sanity_check(COMPONENTS_TO_UPDATE, CALLER_ARGUMENTS.source_pkg) # backup current repo if CALLER_ARGUMENTS.backup_base_dir: backup_repo(CALLER_ARGUMENTS.backup_base_dir, CALLER_ARGUMENTS.target_repo) # update repo - update_repository(CALLER_ARGUMENTS.source_pkg, CALLER_ARGUMENTS.target_repo, COMPONENTS_TO_UPDATE) + update_repository(source_pkg_path, CALLER_ARGUMENTS.target_repo, COMPONENTS_TO_UPDATE) print('\nRepository updated successfully!') |