Merge 12ecc3823b into 6473053b13

update ci target for freebsd 13, r1 is eol

Current CI fails due to the  release_1/ dir returning 404, this will move to working release_2/ dir
ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME

CI

.azure-pipelines/azure-pipelines.yml

@@ -209,8 +209,8 @@ stages:
               test: rhel/8.7
             - name: RHEL 9.1
               test: rhel/9.1
-            - name: FreeBSD 13.1
+            - name: FreeBSD 13.2
-              test: freebsd/13.1
+              test: freebsd/13.2
             - name: FreeBSD 12.4
               test: freebsd/12.4
   - stage: Remote_2_14
@@ -225,8 +225,8 @@ stages:
               test: rhel/7.9
             - name: RHEL 8.6
               test: rhel/8.6
-            - name: FreeBSD 13.1
+            - name: FreeBSD 13.2
-              test: freebsd/13.1
+              test: freebsd/13.2
             - name: FreeBSD 12.4
               test: freebsd/12.4
 

plugins/action/synchronize.py

@@ -77,7 +77,14 @@ class ActionModule(ActionBase):
 
         if self._host_is_ipv6_address(host):
             return '[%s%s]:%s' % (user_prefix, host, path)
+
+        #preserve formatting of remote paths if host or user@host is explicitly defined in the path
+        if ':' not in path:
             return '%s%s:%s' % (user_prefix, host, path)
+        elif '@' not in path:
+            return '%s%s' % (user_prefix, path)
+        else:
+            return path
 
     def _process_origin(self, host, path, user):