demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-02-04 08:03:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix resolver errors during bundle add-on installation (#4224)

Browse Source 
Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2024-05-11 19:15:31 +02:00 committed by GitHub
parent 6eeb9dd7c9
commit ec7674752a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java
View File

@ -195,8 +195,6 @@ public class FeatureInstaller implements ConfigurationListener {
} }
} }
processingConfigQueue.set(false);
try { try {
if (changed) { if (changed) {
featuresService.refreshFeatures(EnumSet.noneOf(FeaturesService.Option.class)); featuresService.refreshFeatures(EnumSet.noneOf(FeaturesService.Option.class));
@ -204,6 +202,8 @@ public class FeatureInstaller implements ConfigurationListener {
} catch (Exception e) { } catch (Exception e) {
logger.error("Failed to refresh bundles after processing config update", e); logger.error("Failed to refresh bundles after processing config update", e);
} }
processingConfigQueue.set(false);
} }
public void addAddon(String type, String id) { public void addAddon(String type, String id) {

14
features/karaf/openhab-core/src/main/feature/feature.xml
View File

@ -519,19 +519,9 @@
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.serial/${project.version}</bundle> <bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.serial/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial/${project.version}</bundle> <bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/${project.version}</bundle>
<conditional>
<condition>req:osgi.native;filter:="(osgi.native.osname=Linux)"</condition>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/${project.version}</bundle>
</conditional>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.ser2net/${project.version}</bundle> <bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.ser2net/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/${project.version}</bundle>
<conditional>
<condition>req:osgi.native;filter:="(osgi.native.osname=Windows*)"</condition>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.discovery.usbserial.windowsregistry/${project.version}</bundle>
</conditional>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}</bundle> <bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx/${project.version}</bundle> <bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/${project.version}</bundle> <bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/${project.version}</bundle>