diff options
| author | Allan McRae <allan@archlinux.org> | 2013-04-11 03:56:06 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-04-12 01:42:41 +0200 |
| commit | 7e0f528274478e7d3057d71717596fdaa5e5bb79 (patch) | |
| tree | ea79e7c002cdee76cabf52fda9338a96e660843a | |
| parent | 2bf2700b744392ab3fb4e5295e3a2619b1ddfe28 (diff) | |
| download | pacman-7e0f528274478e7d3057d71717596fdaa5e5bb79.tar.gz pacman-7e0f528274478e7d3057d71717596fdaa5e5bb79.tar.xz | |
Do not use checkout directory for SVN config
Using the checkout directory for the SVN config can result in clashes
between config files and files from the SVN checkout. Instead, use
a ".makepkg" directory within the checkout.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 67ee22a6..4d9176a2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -705,7 +705,8 @@ download_svn() { if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "svn" - if ! svn checkout --config-dir "$dir" "$url" "$dir"; then + mkdir -p "$dir/.makepkg" + if ! svn checkout --config-dir "$dir/.makepkg" "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn" plain "$(gettext "Aborting...")" exit 1 |