From 628c92b2ec30daffed0411c709a90a1f11667902 Mon Sep 17 00:00:00 2001 From: Alexis Lopez Zubieta Date: Tue, 21 Jun 2022 15:52:55 -0500 Subject: [PATCH] Indentify glibc helper as apprun v2 related --- appimagebuilder/modules/setup/apprun2.py | 4 ++-- appimagebuilder/modules/setup/helpers/__init__.py | 2 +- .../modules/setup/helpers/{libc.py => apprun_2_libc.py} | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) rename appimagebuilder/modules/setup/helpers/{libc.py => apprun_2_libc.py} (98%) diff --git a/appimagebuilder/modules/setup/apprun2.py b/appimagebuilder/modules/setup/apprun2.py index 4c47ee38..921f38f8 100644 --- a/appimagebuilder/modules/setup/apprun2.py +++ b/appimagebuilder/modules/setup/apprun2.py @@ -12,12 +12,12 @@ import fnmatch import logging import os -import queue import random import shutil import string from pathlib import Path from typing import Final + from packaging import version from appimagebuilder.utils import elf, file_utils @@ -167,7 +167,7 @@ def _run_configuration_helpers(self, global_env, preserve_files: [Path]): helpers.GLib, helpers.GStreamer, helpers.Gtk, - helpers.LibC, + helpers.AppRun2LibC, helpers.Java, helpers.LibGL, helpers.OpenSSL, diff --git a/appimagebuilder/modules/setup/helpers/__init__.py b/appimagebuilder/modules/setup/helpers/__init__.py index fc73e58b..ba311797 100644 --- a/appimagebuilder/modules/setup/helpers/__init__.py +++ b/appimagebuilder/modules/setup/helpers/__init__.py @@ -14,7 +14,7 @@ from .glib import GLib from .gstreamer import GStreamer from .gtk import Gtk -from .libc import LibC +from .apprun_2_libc import AppRun2LibC from .java import Java from .libgl import LibGL from .openssl import OpenSSL diff --git a/appimagebuilder/modules/setup/helpers/libc.py b/appimagebuilder/modules/setup/helpers/apprun_2_libc.py similarity index 98% rename from appimagebuilder/modules/setup/helpers/libc.py rename to appimagebuilder/modules/setup/helpers/apprun_2_libc.py index c5823b44..4829dad3 100644 --- a/appimagebuilder/modules/setup/helpers/libc.py +++ b/appimagebuilder/modules/setup/helpers/apprun_2_libc.py @@ -28,7 +28,9 @@ class InterpreterHandlerError(RuntimeError): pass -class LibC(BaseHelper): +class AppRun2LibC(BaseHelper): + """AppRun v2 glibc setup""" + def __init__(self, app_dir, finder): super().__init__(app_dir, finder)