Attachment 11040 Details for Bug 55765 – appcenter.patch

[patch] appcenter.patch

appcenter.patch (text/plain), 1.28 KB, created by Felix Botner on 2023-02-28 11:22:55 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Botner

Created: 2023-02-28 11:22:55 CET

Size: 1.28 KB

patch

obsolete

>diff --git a/management/univention-appcenter/python/appcenter/app.py b/management/univention-appcenter/python/appcenter/app.py
>index 337ecb87d1e..fc07d56f52b 100644
>--- a/management/univention-appcenter/python/appcenter/app.py
>+++ b/management/univention-appcenter/python/appcenter/app.py
>@@ -304,7 +304,15 @@ class AppFromFileAttribute(AppAttribute):
>         def _get_objects_fn(_self):
>             cache_name = '_%s_cache' % name
>             if not hasattr(_self, cache_name):
>-                setattr(_self, cache_name, self.klass.all_from_file(_self.get_cache_file(name), _self.get_locale()))
>+                a = self.klass.all_from_file(_self.get_cache_file(name), _self.get_locale())
>+                b = []
>+                #setattr(_self, cache_name, self.klass.all_from_file(_self.get_cache_file(name), _self.get_locale()))
>+                extra_settings = f"/opt/{_self.id}.settings"
>+                if os.path.isfile(extra_settings):
>+                    b = self.klass.all_from_file(extra_settings, _self.get_locale())
>+                    #setattr(_self, cache_name, self.klass.all_from_file(extra_settings, _self.get_locale()))
>+
>+                setattr(_self, cache_name, a + b)
>             return getattr(_self, cache_name)
> 
>         setattr(klass, 'get_%s' % name, _get_objects_fn)

Actions: View | Diff

Attachments on bug 55765: 11040