From 06a681ca3d36b2165d1cc1b58aff26b7abfa0bf4 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 22 Jan 2012 17:20:52 +0100 Subject: commitpkg: use absolute paths when uploading files This fixes a problem where rsync won't work if the pkgver contains a colon (epoch). In this case rsync assumes that the colon is a remote:path separator and having src and dest both being remote arguments is not supported. Signed-off-by: Florian Pritz Signed-off-by: Pierre Schmitz --- commitpkg.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/commitpkg.in b/commitpkg.in index bf3a5ab..8139090 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -168,6 +168,16 @@ for _arch in ${arch[@]}; do done archrelease "${commit_arches[@]/#/$repo-}" || die +new_uploads=() + +# convert to absolute paths so rsync can work with colons (epoch) +while read -r -d '' upload; do + new_uploads+=("$upload") +done < <(realpath -z "${uploads[@]}") + +uploads=("${new_uploads[@]}") +unset new_uploads + if [[ ${#uploads[*]} -gt 0 ]]; then msg 'Uploading all package and signature files' rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || die -- cgit v1.2.3-54-g00ecf