From e1b6310780f45199d2d85434a15436a99508593a Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Mon, 21 Oct 2024 15:40:27 +0200 Subject: [PATCH 1/2] rpmwatcher: stop overriding interpreters declared by scripts Signed-off-by: Yann Dirson --- scripts/rpmwatcher/run.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/rpmwatcher/run.sh b/scripts/rpmwatcher/run.sh index 7394abb3..a4f2588a 100755 --- a/scripts/rpmwatcher/run.sh +++ b/scripts/rpmwatcher/run.sh @@ -14,22 +14,22 @@ set -xe cd $BASEDIR # sync repos and produce some data -sh $PATH_TO_SCRIPTS/sync_repos.sh +$PATH_TO_SCRIPTS/sync_repos.sh # gather data and produce WIP files for the next scripts to use -python $PATH_TO_SCRIPTS/rpmwatcher_update.py $VERSION . +$PATH_TO_SCRIPTS/rpmwatcher_update.py $VERSION . # get information about the dependencies, from within a CentOS docker container # using "host" network because "bridge" may fail in some hosting environments DOCKER_NETWORK=host docker run --rm -t --privileged --network $DOCKER_NETWORK \ -v ~/data:/data -v ~/git/xcp/scripts/rpmwatcher:/scripts centos:$CENTOS_VERSION \ - python /scripts/rpmwatcher_extract_deps.py $VERSION /data + /scripts/rpmwatcher_extract_deps.py $VERSION /data # compute roles -python $PATH_TO_SCRIPTS/rpmwatcher_extract_roles.py $VERSION . +$PATH_TO_SCRIPTS/rpmwatcher_extract_roles.py $VERSION . # produce reports -python $PATH_TO_SCRIPTS/rpmwatcher_format_reports.py $VERSION . html -python $PATH_TO_SCRIPTS/rpmwatcher_format_reports.py $VERSION . markdown -python $PATH_TO_SCRIPTS/rpmwatcher_format_reports.py $VERSION . csv +$PATH_TO_SCRIPTS/rpmwatcher_format_reports.py $VERSION . html +$PATH_TO_SCRIPTS/rpmwatcher_format_reports.py $VERSION . markdown +$PATH_TO_SCRIPTS/rpmwatcher_format_reports.py $VERSION . csv From d0cef8307b5f2c6c06867d7c78859f0330d71722 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Mon, 21 Oct 2024 15:40:58 +0200 Subject: [PATCH 2/2] rpmwatcher: make extract_deps compatible with both python2 and 3 Signed-off-by: Yann Dirson --- scripts/rpmwatcher/rpmwatcher_extract_deps.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/rpmwatcher/rpmwatcher_extract_deps.py b/scripts/rpmwatcher/rpmwatcher_extract_deps.py index 654e0220..fee36c99 100755 --- a/scripts/rpmwatcher/rpmwatcher_extract_deps.py +++ b/scripts/rpmwatcher/rpmwatcher_extract_deps.py @@ -16,6 +16,7 @@ """ from __future__ import print_function + import argparse import subprocess import os @@ -182,7 +183,7 @@ def main(): # For every SRPM built by ourselves, get its build dependencies # We use our local RPMs directory as target directory to avoid downloads print("\n*** Get build deps for every SRPM built by XCP-ng ***") - for srpm_nvr, build_info in xcp_builds.iteritems(): + for srpm_nvr, build_info in xcp_builds.items(): if build_info['built-by'] == 'xcp-ng': build_info['build-deps'] = get_build_deps(os.path.join(xcp_srpm_repo, srpm_nvr + ".src.rpm"), install_root, @@ -194,7 +195,7 @@ def main(): # For each RPM from our repos, get its runtime dependencies, and add info from xcp_ng_rpms_srpms print("\n*** Get runtime deps for all RPMs ***") - for srpm_nvr, build_info in xcp_builds.iteritems(): + for srpm_nvr, build_info in xcp_builds.items(): for rpm_nvra in build_info['rpms']: installable, deps = get_all_runtime_deps(rpm_nvra, install_root) xcp_rpms[rpm_nvra] = {