[arch-dev-public] [devtools] [PATCH] commitpkg: upload signature if found

[Dan McGee]

On Fri, Apr 1, 2011 at 2:11 PM, Rémy Oudompheng
<remyoudompheng at gmail.com> wrote:
> Also move some rsync options to $rsyncopts to help
> with readability.
>
> Signed-off-by: Rémy Oudompheng <remy at archlinux.org>
> ---
>  commitpkg |   12 +++++++++---
>  1 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/commitpkg b/commitpkg
> index dfc2bd1..fb8f9ea 100755
> --- a/commitpkg
> +++ b/commitpkg
> @@ -104,9 +104,9 @@ for i in 'changelog' 'install'; do
>  done
>
>  # see if any limit options were passed, we'll send them to rsync
> -unset rsyncopts
> +rsyncopts="-p --chmod 'ug=rw,o=r' -c -h -L --progress"
>  if [ "$1" = '-l' ]; then
> -       rsyncopts="--bwlimit=$2"
> +       rsyncopts="$rsyncopts --bwlimit=$2"
>        shift 2
>  fi
>
> @@ -135,7 +135,13 @@ for _arch in ${arch[@]}; do
>                fi
>
>                echo -n 'uploading '
> -               rsync -p --chmod 'ug=rw,o=r' -c -h -L --progress $rsyncopts --partial "${pkgfile}" -e ssh "$server:staging/$repo/${pkgfile##*/}" || abort
> +               rsync -e ssh $rsyncopts --partial "${pkgfile}" "$server:staging/$repo/${pkgfile##*/}" || abort
> +
> +               sigfile="${pkgfile}.sig"
> +               if [ -f "${sigfile}" ]; then
> +                       echo -n 'uploading '
> +                       rsync -e ssh $rsyncopts --partial "${sigfile}" "$server:staging/$repo/${sigfile##*/}" || abort
> +               fi
WTF- so now we've gone back to the original two-upload? What are we doing here?

rsync -e ssh $rsyncopts --partial "${pkgfile}" "${sigfile}"
"$server:staging/$repo/"

will work just fine.

$ rsync -e ssh -p -c -h -L --progress /tmp/foobar /tmp/foobaz
gerolde.archlinux.org:staging/extra/
foobar
           0 100%    0.00kB/s    0:00:00 (xfer#1, to-check=1/2)
foobaz
           0 100%    0.00kB/s    0:00:00 (xfer#2, to-check=0/2)

sent 144 bytes  received 50 bytes  129.33 bytes/sec
total size is 0  speedup is 0.00

dmcgee at galway ~
$ ssh gerolde ls -l staging/extra
total 0
-rw-r--r-- 1 dan users 0 Apr  1 15:19 foobar
-rw-r--r-- 1 dan users 0 Apr  1 15:19 foobaz


>        done
>        archrelease $repo-${_arch} || abort
>  done
> --
> 1.7.4.2
>
>