Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:bmwiedemann:reproducible
meson
test.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File test.patch of Package meson
From 8c05325a3924af386f320bc82fd39dd2f9ae3017 Mon Sep 17 00:00:00 2001 From: Eli Schwartz <eschwartz93@gmail.com> Date: Sun, 28 Jan 2024 00:51:48 -0500 Subject: [PATCH] python module: correct the embedded path for bytecompiled files In recursive scanning, a script variable was overwritten that caused the logic *intended* to make the embedded path be trimmed based on $DESTDIR, to no longer apply. This resulted in embedding the staging path, but only when install_subdir() was used instead of specifying each file as the argument to install_sourcs. --- mesonbuild/scripts/pycompile.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mesonbuild/scripts/pycompile.py b/mesonbuild/scripts/pycompile.py index 619398a3472c..92fad579c176 100644 --- a/mesonbuild/scripts/pycompile.py +++ b/mesonbuild/scripts/pycompile.py @@ -19,16 +19,16 @@ def compileall(files): f = f[12:] ddir = None - fullpath = os.environ['MESON_INSTALL_DESTDIR_'+key] + f + fullpath = absf = os.environ['MESON_INSTALL_DESTDIR_'+key] + f f = os.environ['MESON_INSTALL_'+key] + f - if fullpath != f: + if absf != f: ddir = os.path.dirname(f) - if os.path.isdir(fullpath): - for root, _, files in os.walk(fullpath): + if os.path.isdir(absf): + for root, _, files in os.walk(absf): if ddir is not None: - ddir = root.replace(fullpath, f, 1) + ddir = root.replace(absf, f, 1) for dirf in files: if dirf.endswith('.py'): fullpath = os.path.join(root, dirf)
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