<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-infrastructure.

</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/fa9939bf1d80b1c18817db351cb241d6ac04129c">https://github.com/macports/macports-infrastructure/commit/fa9939bf1d80b1c18817db351cb241d6ac04129c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new fa9939b  buildbot: define RsyncDeployStep earlier
</span>fa9939b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit fa9939bf1d80b1c18817db351cb241d6ac04129c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Mar 4 05:31:40 2025 +1100

<span style='display:block; white-space:pre;color:#404040;'>    buildbot: define RsyncDeployStep earlier
</span>---
 buildbot/master.cfg | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/buildbot/master.cfg b/buildbot/master.cfg
</span><span style='display:block; white-space:pre;color:#808080;'>index 47a3c54..f66ceb4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/buildbot/master.cfg
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/buildbot/master.cfg
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -622,6 +622,17 @@ def make_ssh_deploy_step(sshkeyfile, sshknownhostsfile, step):
</span>             mode=0600),
         step)
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+class RsyncDeployStep(steps.ShellCommand):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    def __init__(self, host, user, srcpath, destpath, **kwargs):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        super(RsyncDeployStep, self).__init__(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                name='rsync',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                description=['deploying'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                descriptionDone=['deploy'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                command='rsync -avzhC --delay-updates --delete-delay %s %s@%s:%s/' % (srcpath, user, host, destpath),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                env={'RSYNC_RSH': 'ssh -i ssh_key -oUserKnownHostsFile=ssh_known_hosts'},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                **kwargs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> 
 # -- Port Builder --
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -699,16 +710,6 @@ portbuilder_factory.addStep(steps.ShellCommand(
</span>     descriptionDone=['clean'],
     alwaysRun=True))
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-class RsyncDeployStep(steps.ShellCommand):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    def __init__(self, host, user, srcpath, destpath, **kwargs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        super(RsyncDeployStep, self).__init__(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                name='rsync',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                description=['deploying'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                descriptionDone=['deploy'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                command='rsync -avzhC --delay-updates --delete-delay %s %s@%s:%s/' % (srcpath, user, host, destpath),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                env={'RSYNC_RSH': 'ssh -i ssh_key -oUserKnownHostsFile=ssh_known_hosts'},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                **kwargs)
</span> 
 class PostgresDeployStep(steps.ShellCommand):
 
</pre><pre style='margin:0'>

</pre>