From a3c5b501b7604413821330787f52683ad731f7c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Mon, 24 Oct 2022 12:48:11 +0200 Subject: [PATCH] phase1: rsync_src_url is always set MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 13dc148..0b7c609 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -1035,24 +1035,23 @@ for target in targets: locks = NetLockUl, )) - if rsync_src_url is not None: - factory.addStep(ShellCommand( - name = "sourcelist", - description = "Finding source archives to upload", - command = "find dl/ -maxdepth 1 -type f -not -size 0 -not -name '.*' -not -name '*.hash' -not -name '*.dl' -newer .config -printf '%f\\n' > sourcelist", - haltOnFailure = True - )) + factory.addStep(ShellCommand( + name = "sourcelist", + description = "Finding source archives to upload", + command = "find dl/ -maxdepth 1 -type f -not -size 0 -not -name '.*' -not -name '*.hash' -not -name '*.dl' -newer .config -printf '%f\\n' > sourcelist", + haltOnFailure = True + )) - factory.addStep(ShellCommand( - name = "sourceupload", - description = "Uploading source archives", - command=["../rsync.sh", "--files-from=sourcelist", "--size-only", "--delay-updates"] + rsync_src_defopts + - [Interpolate("--partial-dir=.~tmp~%(kw:target)s~%(kw:subtarget)s~%(prop:workername)s", target=ts[0], subtarget=ts[1]), "-a", "dl/", "%s/" %(rsync_src_url)], - env={'RSYNC_PASSWORD': rsync_src_key}, - haltOnFailure = True, - logEnviron = False, - locks = NetLockUl, - )) + factory.addStep(ShellCommand( + name = "sourceupload", + description = "Uploading source archives", + command=["../rsync.sh", "--files-from=sourcelist", "--size-only", "--delay-updates"] + rsync_src_defopts + + [Interpolate("--partial-dir=.~tmp~%(kw:target)s~%(kw:subtarget)s~%(prop:workername)s", target=ts[0], subtarget=ts[1]), "-a", "dl/", "%s/" %(rsync_src_url)], + env={'RSYNC_PASSWORD': rsync_src_key}, + haltOnFailure = True, + logEnviron = False, + locks = NetLockUl, + )) factory.addStep(ShellCommand( name = "df", -- 2.30.2