Skip to content

clippy: do not fail the scan if clippy fails to install #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kdudka merged 2 commits into from
Jun 19, 2024
Merged

clippy: do not fail the scan if clippy fails to install #174

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd4a143
clippy: rename install_clippy_hook -> inject_clippy_hook
kdudka Jun 19, 2024
69b366f
clippy: do not fail the scan if clippy fails to install
kdudka Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions py/plugins/clippy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import os

import csmock.common.util
from csmock.common.util import write_toolver_from_rpmlist

RUN_CLIPPY_CONVERT = "/usr/share/csmock/scripts/convert-clippy.py"
CLIPPY_OUTPUT = "/builddir/clippy-output.txt"
CLIPPY_INSTALL = "/usr/share/csmock/scripts/inject-clippy.sh"
CLIPPY_INJECT_SCRIPT = "/usr/share/csmock/scripts/inject-clippy.sh"

class PluginProps:
def __init__(self):
Expand All @@ -28,14 +28,20 @@ def handle_args(self, parser, args, props):
if not self.enabled:
return

def install_clippy_hook(results, mock):
return mock.exec_chroot_cmd(CLIPPY_INSTALL)
props.post_depinst_hooks += [install_clippy_hook]
# install `clippy` only if the package is available in the build repos
props.install_opt_pkgs += ["clippy"]

props.install_pkgs += ["clippy"]
props.copy_out_files += [CLIPPY_OUTPUT]
def inject_clippy_hook(results, mock):
ec = write_toolver_from_rpmlist(results, mock, "clippy", "clippy")
if 0 != ec:
# a warning has already been emitted
return 0

# clippy was found in the buildroot -> instrument the build
props.copy_out_files += [CLIPPY_OUTPUT]
return mock.exec_chroot_cmd(CLIPPY_INJECT_SCRIPT)

csmock.common.util.install_default_toolver_hook(props, "clippy")
props.post_depinst_hooks += [inject_clippy_hook]

def convert_hook(results):
src = f"{results.dbgdir_raw}{CLIPPY_OUTPUT}"
Expand Down