Merge ~hloeung/ubuntu-mirror-charm:rsync into ubuntu-mirror-charm:master

[Haw Loeung]

Sync changes from the syncproxy scripts in the mojo spec

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Review Bot (canonical-is-reviewbot)]

Proxy approval for jsimpso

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 242f2fb5504601c11b22f772bed66917932363f0

diff --git a/files/mirror-1stage.sh b/files/mirror-1stage.sh
index c3e15ae..4cf5fe3 100755
--- a/files/mirror-1stage.sh
+++ b/files/mirror-1stage.sh
@@ -49,6 +49,8 @@ else
 fi
 
 export RSYNC_PASSWORD
+# work around LP#2009575
+export RSYNC_OLD_ARGS=1
 lockfile="Archive-Update-in-Progress-${role}-${myhostname}"
 lockpath="${DEST_DIR}/${lockfile}"
 
diff --git a/files/mirror-2stage.sh b/files/mirror-2stage.sh
index a7146a8..9eac9c5 100755
--- a/files/mirror-2stage.sh
+++ b/files/mirror-2stage.sh
@@ -50,6 +50,8 @@ else
 fi
 
 export RSYNC_PASSWORD
+# work around LP#2009575
+export RSYNC_OLD_ARGS=1
 lockpath="${DEST_DIR}/Archive-Update-in-Progress-${role}-${myhostname}"
 
 if lockfile -! -l 43200 -r 0 "${lockpath}"; then