From 75fb97b4b73c2bf5b369b8fa9ba1d3356e50f59b Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sep 12 2025 11:12:14 +0000 Subject: Fix source flattening fix for newer RPM versions It looks like the original attempt at fixing for the described extra build directory level remained in place by accident when pushing the build directory discovery task: The latter returns {{srcdir}} irrespective of RPM version which contains the extracted upstream source tarball. The "Flatten sources" task is meant to strip the typically contained top-level directory from there. Fixes: 164e28b05d87c ("Correct source flattening for RPM 4.19.90+ (#2290735)") Signed-off-by: Phil Sutter --- diff --git a/roles/standard-test-source/tasks/main.yml b/roles/standard-test-source/tasks/main.yml index c61c270..a4c6a9a 100644 --- a/roles/standard-test-source/tasks/main.yml +++ b/roles/standard-test-source/tasks/main.yml @@ -107,7 +107,7 @@ - name: Flatten sources shell: | shopt -s dotglob - mv {{ builddir.stdout }}/*/*/* {{ builddir.stdout }} + mv {{ builddir.stdout }}/*/* {{ builddir.stdout }} when: - flatten - not fetch_only