Fixes FS#36654: https://bugs.archlinux.org/task/36654.

Signed-off-by: Maxime Gauduin <[email protected]>
---
 makechrootpkg.in | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 8c64ae1..e582a07 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -285,14 +285,16 @@ _chrootbuild() {
        ln -sft /srcdest /srcdest_host/*
        ln -sft /startdir /startdir_host/*
 
-       # XXX: Keep svn sources writable
+       # XXX: Keep bzr and svn sources writable
        # Since makepkg 4.1.1 they get checked out via cp -a, copying the 
symlink
        for dir in /srcdest /startdir; do
-               cd $dir
-               for svndir in */.svn; do
-                       rm ${svndir%/.svn}
-                       cp -a ${dir}_host/${svndir%/.svn} .
-                       chown -R nobody ${svndir%/.svn}
+               for vcs in bzr svn; do
+                       cd "$dir"
+                       for vcsdir in */.$vcs; do
+                               rm "${vcsdir%/.$vcs}"
+                               cp -a "${dir}_host/${vcsdir%/.$vcs}" .
+                               chown -R nobody "${vcsdir%/.$vcs}"
+                       done
                done
        done
 
-- 
1.8.3.4

Reply via email to