Fix bug in creating rsync configuration.

Signed-off-by: Volker Theile <votdev@gmx.de>
openmediavault · Aug 29, 2019 · eb2eaa1 · eb2eaa1
1 parent e094647
commit eb2eaa1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/deb/openmediavault/debian/changelog b/deb/openmediavault/debian/changelog
@@ -1,5 +1,6 @@
 openmediavault (5.0.6-1) unstable; urgency=low
 
+  * Fix bug in creating rsync configuration.
   * Issue #419: Fix bug in NFS configuration file. The fsid was not
     incremented correctly.
 

diff --git a/deb/openmediavault/srv/salt/_modules/omv_utils.py b/deb/openmediavault/srv/salt/_modules/omv_utils.py
@@ -255,7 +255,7 @@ def add_slashes(value):
         * double quote (")
     :rtype: str
     """
-    return openmediavault.string.add_slashes(path)
+    return openmediavault.string.add_slashes(value)
 
 
 @jinja_filter('path_prettify')

diff --git a/deb/openmediavault/srv/salt/omv/deploy/rsync/files/cron-rsync-script.j2 b/deb/openmediavault/srv/salt/omv/deploy/rsync/files/cron-rsync-script.j2
@@ -13,9 +13,9 @@
   {%- if job.mode == 'push' -%}
     {%- set srcuri = salt['omv_conf.get_sharedfolder_path'](job.src.sharedfolderref) -%}
     {%- set srcmntdir = salt['omv_conf.get_sharedfolder_mount_path'](job.src.sharedfolderref) -%}
-    {%- set desturi = salt['omv_conf.get_sharedfolder_path'](job.dest.uri) -%}
+    {%- set desturi = job.dest.uri -%}
   {%- elif job.mode == 'pull' -%}
-    {%- set srcuri = salt['omv_conf.get_sharedfolder_path'](job.src.uri) -%}
+    {%- set srcuri = job.src.uri -%}
     {%- set desturi = salt['omv_conf.get_sharedfolder_path'](job.dest.sharedfolderref) -%}
     {%- set destmntdir = salt['omv_conf.get_sharedfolder_mount_path'](job.dest.sharedfolderref) -%}
   {%- endif -%}