diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-08-31 15:55:38 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-08-31 16:52:11 +0300 |
| commit | a098bd094cd3e38f6c20b4fe615ff2b3c8b6c7ee (patch) | |
| tree | 51ef76d72e23f9f84d535992be92f4c8cf9d6320 /build_files/utils | |
| parent | 82ef1edce4a2152c59a093705be2fcccc3256ab2 (diff) | |
Build: use non-interactive svn commands for "make update"
Needed for buildbot, but interactively solving svn conflicts in the middle
of manual make update is also not ideal.
Diffstat (limited to 'build_files/utils')
| -rwxr-xr-x | build_files/utils/make_update.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py index 8a32fc013be..1bd8d383284 100755 --- a/build_files/utils/make_update.py +++ b/build_files/utils/make_update.py @@ -27,6 +27,7 @@ args = parse_arguments() only_code = args.only_code git_command = args.git_command svn_command = args.svn_command +svn_non_interactive = [args.svn_command, '--non-interactive'] if shutil.which(git_command) is None: sys.stderr.write("git not found, can't update code\n") @@ -68,7 +69,7 @@ if not only_code: print_stage("Checking out Precompiled Libraries") svn_url_platform = svn_url + lib_platform - call([svn_command, "checkout", svn_url_platform, lib_platform_dirpath]) + call(svn_non_interactive + ["checkout", svn_url_platform, lib_platform_dirpath]) # Update precompiled libraries and tests print_stage("Updating Precompiled Libraries and Tests") @@ -84,9 +85,9 @@ if not only_code: if os.path.isdir(dirpath) and \ (os.path.exists(svn_dirpath) or os.path.exists(svn_root_dirpath)): - call([svn_command, "cleanup", dirpath]) - call([svn_command, "switch", svn_url + dirname, dirpath]) - call([svn_command, "update", dirpath]) + call(svn_non_interactive + ["cleanup", dirpath]) + call(svn_non_interactive + ["switch", svn_url + dirname, dirpath]) + call(svn_non_interactive + ["update", dirpath]) # Update blender repository and submodules. print_stage("Updating Blender Git Repository and Submodules") |