Skip to content
Snippets Groups Projects
Commit 8e2e3096 authored by Miroslav Saur's avatar Miroslav Saur
Browse files

Merge branch 'cherry-pick-5aee24da' into '2024-patches'

Trust file-content-metadata path on CVMFS when cloning for '2024-patches'

See merge request !4874
parents dfa7742e df448253
No related branches found
No related tags found
2 merge requests!4874Trust file-content-metadata path on CVMFS when cloning for '2024-patches',!4774Synchronize master branch with 2024-patches
Pipeline #10296611 passed
......@@ -11,6 +11,7 @@
import os
import json
import re
import shlex
import time
import contextlib
import subprocess
......@@ -383,13 +384,12 @@ def _default_metainfo_repo():
with _lockfile('PyConf-create-lhcb-metadata-git-repo.lock'):
if _is_repo(repo): return repo
log.warning('*** cloning metadata git repo into {}'.format(repo))
result = subprocess.run([
'git', 'clone', '-q', FILE_CONTENT_METADATA,
repo.removesuffix('/.git')
],
capture_output=True,
text=True,
check=False)
upload_pack_cmd = f'git -c safe.directory={shlex.quote(FILE_CONTENT_METADATA)} upload-pack'
cmd = ['git', '-c', f'safe.directory={FILE_CONTENT_METADATA}']
cmd += ['clone', '-q', '-u', upload_pack_cmd]
cmd += [FILE_CONTENT_METADATA, repo.removesuffix('/.git')]
result = subprocess.run(
cmd, capture_output=True, text=True, check=False)
if result.returncode == 0: return repo
log.warning('*** failed to clone metadata git repo into {}: {}'.format(
repo, result.stderr))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment