Skip to content
Snippets Groups Projects

runtime: Search gconv in the correct dir when it starts with /app

Merged Ludovico de Nittis requested to merge wip/libc_app_subdir into master

When we search for gconv in the provider, if the directory we derived from libc starts with "/app/", we should not prepend "/usr/" because we don't expect to have "/usr/app/" in the provider.

Without this patch, pressure-vessel in a Flatpak container fails to load i386 gconv with the following message: "We were expecting the gconv modules directory in the provider to be located in "/app/lib/i386-linux-gnu/gconv", but instead it is missing"

Merge request reports

Merge request pipeline #11460 passed

Merge request pipeline passed for 8d596901

Approved by

Merged by Simon McVittieSimon McVittie 3 years ago (Apr 9, 2021 1:20pm UTC)

Merge details

  • Changes merged into master with 79407cf2.
  • Deleted the source branch.

Pipeline #11462 passed

Pipeline passed for 79407cf2 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply
Loading