On Sun, Aug 25, 2013 at 7:06 PM, Dave Reisner <d@falconindy.com> wrote:

On Sun, Aug 25, 2013 at 06:35:03PM +0200, Maxime Gauduin wrote:
> Fixes FS#36654: https://bugs.archlinux.org/task/36654.
>
> Signed-off-by: Maxime Gauduin <alucryd@gmail.com>
> ---
>  makechrootpkg.in | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/makechrootpkg.in b/makechrootpkg.in
> index 8c64ae1..b842d2f 100644
> --- a/makechrootpkg.in
> +++ b/makechrootpkg.in
> @@ -296,6 +296,16 @@ _chrootbuild() {
>               done
>       done
>
> +     # Same with bzr sources
> +     for dir in /srcdest /startdir; do
> +             cd $dir
> +             for bzrdir in */.bzr; do
> +                     rm ${bzrdir%/.bzr}

Isn't this going to be a directory? How does this rm call succeed?

> +                     cp -a ${dir}_host/${bzrdir%/.bzr} .
> +                     chown -R nobody ${bzrdir%/.bzr}
> +             done
> +     done

General mention: please quote liberally rather than assuming that the
contents will never be quoteworthy.

> +
>       cd /startdir
>
>       # XXX: Keep PKGBUILD writable for pkgver()
> --
> 1.8.3.4
>

Right, all I did was copy paste the equivalent for svn in the script, replacing svn with bzr. I'll modify both svn and bzr with quotes and add -rf to the rm command.

--

Maxime