Skip to content
Snippets Groups Projects
Commit 24b1da3b authored by Simon McVittie's avatar Simon McVittie
Browse files

populate-depot: Don't list contents of tarballs we unpack


For SDKs, the result is very long.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent b9bba02b
No related branches found
No related tags found
No related merge requests found
...@@ -537,7 +537,7 @@ class Main: ...@@ -537,7 +537,7 @@ class Main:
argv = [ argv = [
'tar', 'tar',
'-C', dest, '-C', dest,
'-xvf', os.path.join(self.depot, runtime.sdk_tarball), '-xf', os.path.join(self.depot, runtime.sdk_tarball),
] ]
logger.info('%r', argv) logger.info('%r', argv)
subprocess.run(argv, check=True) subprocess.run(argv, check=True)
...@@ -546,7 +546,7 @@ class Main: ...@@ -546,7 +546,7 @@ class Main:
'tar', 'tar',
'-C', os.path.join(dest, 'files', 'lib', 'debug'), '-C', os.path.join(dest, 'files', 'lib', 'debug'),
'--transform', r's,^\(\./\)\?files\(/\|$\),,', '--transform', r's,^\(\./\)\?files\(/\|$\),,',
'-xvf', '-xf',
os.path.join(self.depot, runtime.debug_tarball), os.path.join(self.depot, runtime.debug_tarball),
] ]
logger.info('%r', argv) logger.info('%r', argv)
...@@ -564,7 +564,7 @@ class Main: ...@@ -564,7 +564,7 @@ class Main:
'tar', 'tar',
'-C', os.path.join(sysroot, 'files'), '-C', os.path.join(sysroot, 'files'),
'--exclude', 'dev/*', '--exclude', 'dev/*',
'-xvf', '-xf',
os.path.join(self.depot, runtime.sysroot_tarball), os.path.join(self.depot, runtime.sysroot_tarball),
] ]
logger.info('%r', argv) logger.info('%r', argv)
...@@ -682,7 +682,7 @@ class Main: ...@@ -682,7 +682,7 @@ class Main:
def use_local_pressure_vessel(self, path: str = '.') -> None: def use_local_pressure_vessel(self, path: str = '.') -> None:
pv_dir = os.path.join(self.depot, 'pressure-vessel') pv_dir = os.path.join(self.depot, 'pressure-vessel')
os.makedirs(pv_dir, exist_ok=True) os.makedirs(pv_dir, exist_ok=True)
argv = ['tar', '-C', pv_dir, '--strip-components=1', '-xvf'] argv = ['tar', '-C', pv_dir, '--strip-components=1', '-xf']
if os.path.isfile(path): if os.path.isfile(path):
argv.append(path) argv.append(path)
...@@ -706,7 +706,7 @@ class Main: ...@@ -706,7 +706,7 @@ class Main:
os.makedirs(self.depot, exist_ok=True) os.makedirs(self.depot, exist_ok=True)
subprocess.run( subprocess.run(
[ [
'tar', '-C', self.depot, '-xvf', 'tar', '-C', self.depot, '-xf',
os.path.join(self.cache or tmp, filename), os.path.join(self.cache or tmp, filename),
], ],
check=True, check=True,
...@@ -882,7 +882,7 @@ class Main: ...@@ -882,7 +882,7 @@ class Main:
) )
subprocess.run( subprocess.run(
[ [
'tar', '-C', self.unpack_ld_library_path, '-xvf', 'tar', '-C', self.unpack_ld_library_path, '-xf',
os.path.join(self.cache or tmp, filename), os.path.join(self.cache or tmp, filename),
], ],
check=True, check=True,
......
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