Skip to content

Further preparation for !337

Simon McVittie requested to merge wip/t29490-prep into master

Some smaller commits from !337 (merged) for which @denittis didn't have any review comments. Some of these are prerequisites for larger changes.

  • adverb.1: Remove blank line from arguments

  • pv-adverb: Index abi_tuples_details with abi, not jj

    Three nested loops with non-indicative iterator names are enough to get confusing, so let's index this array with an iterator with a meaningful name.

  • exports: Sync with flatpak/flatpak#4352

    This provides some more design-for-test that we can use when unit-testing wrap-setup.c.

    Forwarded: https://github.com/flatpak/flatpak/pull/4352
    Applied-upstream: 1.11.3, commit:c392e5ad

  • pressure-vessel: Exclude adjusted LD_PRELOAD from PreloadModule[]

    I think this makes it a bit clearer what's going on: we populate one list (currently a PreloadModule[]) from the command-line options, then translate it to form a second list (in -wrap it's a plain GPtrArray, in -adverb it's implicit in the environment variables we're setting).

  • pv-wrap: Hoist ld.so.blockedlist adjustment out of loop

    We only need to do this once, and it's harmless to do this even if libshared-library-guard isn't even in use, so we might as well move it out of the loops.

Merge request reports