phase1: honour version prefix when fetching sha256sums
authorJo-Philipp Wich <jo@mein.io>
Thu, 20 Jun 2019 15:42:17 +0000 (17:42 +0200)
committerJo-Philipp Wich <jo@mein.io>
Thu, 20 Jun 2019 15:45:07 +0000 (17:45 +0200)
This is requires for non-master builds which use a slightly different
directory layout on the rsync host.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
phase1/master.cfg

index f5068675bafc9e6485f65774f97795da1f964e96..665d41ee364e95bfa0366dd388622b8b771839e3 100644 (file)
@@ -930,7 +930,7 @@ for target in targets:
        factory.addStep(ShellCommand(
                name = "target-sha256sums",
                description = "Fetching remote sha256sums for target",
-               command = ["rsync", "-z"] + rsync_defopts + [Interpolate("%(kw:rsyncbinurl)s/targets/%(kw:target)s/%(kw:subtarget)s/sha256sums", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1]), "target-sha256sums"],
+               command = ["rsync", "-z"] + rsync_defopts + [Interpolate("%(kw:rsyncbinurl)s/%(kw:prefix)stargets/%(kw:target)s/%(kw:subtarget)s/sha256sums", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1], prefix=GetVersionPrefix), "target-sha256sums"],
                env={'RSYNC_PASSWORD': rsync_bin_key},
                logEnviron = False,
                haltOnFailure = False,