phase1: rsync_src_url is always set

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 13dc14841fd31849e678ad684750d975c539737e..0b7c6091aa946e95d1601ce751fab2e017b05d66 100644 (file)
--- 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",