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

[Dan McGee]

On Thu, Mar 31, 2011 at 6:00 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>
> ---
> This patch was part of a patchset posted by Allan two weeks
> ago. Only one of his patches was merged, this is the
> second one, which include remarks made by Dan. Along with
> the dbscripts patch, it would allow current developers
> to begin signing their packages, and have the signatures
> transferred to mirrors with a smooth workflow even if
> signature checking is not fully integrated in pacman.
>
>  commitpkg |   12 +++++++++---
>  1 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/commitpkg b/commitpkg
> index dfc2bd1..b478989 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
>
> @@ -134,8 +134,14 @@ for _arch in ${arch[@]}; do
>                        continue 2
>                fi
>
> +               sigfile="${pkgfile}.sig"
> +               if [ -f "${sigfile}" ]; then
> +                       echo "WARNING: No package signature found"
> +                       sigfile=""
> +               fi
Maybe for now disable this warning so we can get this patch into the
toolchain now for those of us using tools generating signatures, but
not bothering those that aren't? The sooner this gets added to
devtools (and dbscripts), the sooner we will have good test data to
work from to finish the rest of the signing stuff in pacman.

> +
>                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}" ${sigfile} "$server:staging/$repo/${pkgfile##*/}" || abort
>        done
>        archrelease $repo-${_arch} || abort
>  done
> --
> 1.7.4.2
>
>