Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.5:Update
python3-libmount.27340
util-linux-fix-tests-when-at-symbol-in-path.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File util-linux-fix-tests-when-at-symbol-in-path.patch of Package python3-libmount.27340
From 057579455a40d0cc7612938aa3d11a02b279e89c Mon Sep 17 00:00:00 2001 From: David Anes <david.anes@suse.com> Date: Fri, 9 Dec 2022 18:09:31 +0100 Subject: [PATCH] tests: allow paths in tests to contain '@' char Tests fail when the build directory contains '@' in its path, as its sent to 'sed' unescaped. This patch allows to build in such environments, which typically happen on automated systems (for example, when building concurrently with Jenkins). --- tests/functions.sh | 4 +++- tests/ts/minix/fsck | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) Index: util-linux-2.33.2/tests/functions.sh =================================================================== --- util-linux-2.33.2.orig/tests/functions.sh +++ util-linux-2.33.2/tests/functions.sh @@ -695,7 +695,9 @@ function ts_fdisk_clean { # remove non comparable parts of fdisk output if [ -n "${DEVNAME}" ]; then - sed -i -e "s@${DEVNAME}@<removed>@;" $TS_OUTPUT + # escape "@" with "@@" in $img. This way sed correctly + # replaces paths containing "@" characters + sed -i -e "s@${DEVNAME//\@/\\\@}@<removed>@;" $TS_OUTPUT fi sed -i \ Index: util-linux-2.33.2/tests/ts/minix/fsck =================================================================== --- util-linux-2.33.2.orig/tests/ts/minix/fsck +++ util-linux-2.33.2/tests/ts/minix/fsck @@ -50,7 +50,10 @@ done rm -f $img -sed -i "s@$img@image@g" $TS_OUTPUT +# escape "@" with "@@" in $img. This way sed correctly +# replaces paths containing "@" characters +sed -i "s@${img//\@/\\\@}@image@g" $TS_OUTPUT + ts_finalize
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor