python-fd: merge local-fileset into one file

bareos · Nov 23, 2023 · d15edfa · d15edfa
1 parent 4922b50
commit d15edfa
Show file tree

Hide file tree

Showing 6 changed files with 180 additions and 234 deletions.
diff --git a/...forms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.filedaemon-python-plugins-common b/...forms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.filedaemon-python-plugins-common
@@ -1,6 +1,5 @@
 
 lib/bareos/plugins/bareos-fd-local-fileset.py
 lib/bareos/plugins/BareosFdPluginBaseclass.py
-lib/bareos/plugins/BareosFdPluginLocalFileset.py
 lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.py
 lib/bareos/plugins/BareosFdWrapper.py
diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec
@@ -1454,7 +1454,6 @@ mkdir -p %{?buildroot}/%{_libdir}/bareos/plugins/vmware_plugin
 %files filedaemon-python-plugins-common
 %{plugin_dir}/bareos-fd-local-fileset.py*
 %{plugin_dir}/BareosFdPluginBaseclass.py*
-%{plugin_dir}/BareosFdPluginLocalFileset.py*
 %{plugin_dir}/BareosFdPluginLocalFilesBaseclass.py*
 %{plugin_dir}/BareosFdWrapper.py*
 

diff --git a/core/src/plugins/filed/python/CMakeLists.txt b/core/src/plugins/filed/python/CMakeLists.txt
@@ -114,7 +114,6 @@ endif()
 set(PYFILES
     pyfiles/BareosFdPluginBaseclass.py
     pyfiles/BareosFdWrapper.py
-    pyfiles/BareosFdPluginLocalFileset.py
     pyfiles/BareosFdPluginLocalFilesBaseclass.py
     pyfiles/bareos-fd-local-fileset.py
     ldap/bareos-fd-ldap.py

diff --git a/core/src/plugins/filed/python/pyfiles/BareosFdPluginLocalFileset.py b/core/src/plugins/filed/python/pyfiles/BareosFdPluginLocalFileset.py