pbuilder-dist: use shutil.which instead of distutils.spawn.find_executable() to save a dependency

LP: #1936697
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
This commit is contained in:
Mattia Rizzolo 2021-07-17 17:47:51 +02:00
parent 7f227f6264
commit 4fc36efcf2
No known key found for this signature in database
GPG Key ID: 0816B9E18C762BAD

View File

@ -29,11 +29,11 @@
# configurations. For example, a symlink called pbuilder-hardy will assume # configurations. For example, a symlink called pbuilder-hardy will assume
# that the target distribution is always meant to be Ubuntu Hardy. # that the target distribution is always meant to be Ubuntu Hardy.
import distutils.spawn
import os import os
import os.path import os.path
import subprocess
import sys import sys
import subprocess
import shutil
import debian.deb822 import debian.deb822
from contextlib import suppress from contextlib import suppress
@ -449,7 +449,7 @@ def main():
if len(parts) > 2: if len(parts) > 2:
requested_arch = parts[2] requested_arch = parts[2]
elif len(args) > 0: elif len(args) > 0:
if distutils.spawn.find_executable('arch-test'): if shutil.which('arch-test') is not None:
if subprocess.run( if subprocess.run(
['arch-test', args[0]], ['arch-test', args[0]],
stdout=subprocess.DEVNULL).returncode == 0: stdout=subprocess.DEVNULL).returncode == 0: