Skip to content
Snippets Groups Projects

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

Merged Miroslav Saur requested to merge cherry-pick-8e2e3096 into v55r14-patches
All threads resolved!
1 file
+ 7
7
Compare changes
  • Side-by-side
  • Inline
@@ -11,6 +11,7 @@
@@ -11,6 +11,7 @@
import os
import os
import json
import json
import re
import re
 
import shlex
import time
import time
import contextlib
import contextlib
import subprocess
import subprocess
@@ -383,13 +384,12 @@ def _default_metainfo_repo():
@@ -383,13 +384,12 @@ def _default_metainfo_repo():
with _lockfile('PyConf-create-lhcb-metadata-git-repo.lock'):
with _lockfile('PyConf-create-lhcb-metadata-git-repo.lock'):
if _is_repo(repo): return repo
if _is_repo(repo): return repo
log.warning('*** cloning metadata git repo into {}'.format(repo))
log.warning('*** cloning metadata git repo into {}'.format(repo))
result = subprocess.run([
upload_pack_cmd = f'git -c safe.directory={shlex.quote(FILE_CONTENT_METADATA)} upload-pack'
'git', 'clone', '-q', FILE_CONTENT_METADATA,
cmd = ['git', '-c', f'safe.directory={FILE_CONTENT_METADATA}']
repo.removesuffix('/.git')
cmd += ['clone', '-q', '-u', upload_pack_cmd]
],
cmd += [FILE_CONTENT_METADATA, repo.removesuffix('/.git')]
capture_output=True,
result = subprocess.run(
text=True,
cmd, capture_output=True, text=True, check=False)
check=False)
if result.returncode == 0: return repo
if result.returncode == 0: return repo
log.warning('*** failed to clone metadata git repo into {}: {}'.format(
log.warning('*** failed to clone metadata git repo into {}: {}'.format(
repo, result.stderr))
repo, result.stderr))
Loading