mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 17:20:36 +00:00
git-update: Fix passing fetch_args
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/255>
This commit is contained in:
parent
b29665f3bd
commit
c24958c781
1 changed files with 4 additions and 4 deletions
|
@ -61,7 +61,7 @@ def update_subprojects(manifest, no_interaction=False, status=False):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
revision, args = repos_commits.get(repo_name, [None, []])
|
revision, args = repos_commits.get(repo_name, [None, []])
|
||||||
if not update_repo(repo_name, repo_dir, revision, no_interaction, args, status=status):
|
if not update_repo(repo_name, repo_dir, revision, no_interaction, fetch_args=args, status=status):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
@ -103,7 +103,7 @@ def update_repo(repo_name, repo_dir, revision, no_interaction, fetch_args=None,
|
||||||
revision = ensure_revision_if_necessary(repo_dir, revision)
|
revision = ensure_revision_if_necessary(repo_dir, revision)
|
||||||
git("config", "rebase.autoStash", "true", repository_path=repo_dir)
|
git("config", "rebase.autoStash", "true", repository_path=repo_dir)
|
||||||
|
|
||||||
fetch_args = fetch_args if fetch_args is None else []
|
fetch_args = fetch_args if fetch_args is not None else []
|
||||||
fetch_args.append('--tags')
|
fetch_args.append('--tags')
|
||||||
fatal = fatal_git_fetches(repo_dir)
|
fatal = fatal_git_fetches(repo_dir)
|
||||||
try:
|
try:
|
||||||
|
@ -142,7 +142,7 @@ def update_repo(repo_name, repo_dir, revision, no_interaction, fetch_args=None,
|
||||||
|
|
||||||
if recurse_i < 3:
|
if recurse_i < 3:
|
||||||
return update_repo(repo_name, repo_dir, revision, no_interaction,
|
return update_repo(repo_name, repo_dir, revision, no_interaction,
|
||||||
recurse_i + 1)
|
recurse_i=recurse_i + 1)
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
print("\nCould not rebase %s, please fix and try again."
|
print("\nCould not rebase %s, please fix and try again."
|
||||||
|
@ -214,7 +214,7 @@ if __name__ == "__main__":
|
||||||
repos_commits = {}
|
repos_commits = {}
|
||||||
|
|
||||||
revision, args = repos_commits.get('gst-build', [None, []])
|
revision, args = repos_commits.get('gst-build', [None, []])
|
||||||
if not update_repo('gst-build', SCRIPTDIR, revision, options.no_interaction, args, status=options.status):
|
if not update_repo('gst-build', SCRIPTDIR, revision, options.no_interaction, fetch_args=args, status=options.status):
|
||||||
exit(1)
|
exit(1)
|
||||||
if not update_subprojects(options.manifest, options.no_interaction, status=options.status):
|
if not update_subprojects(options.manifest, options.no_interaction, status=options.status):
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
Loading…
Reference in a new issue