From 839bb562693d83aa61e996b492b731ff452a2bcd Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Sat, 8 Aug 2009 19:21:50 +1000
Subject: makepkg: change to pkgdir before creating PKGINFO file

Commit 01f9ae63 moved that creation of the PKGINFO file to before changing
to pkgdir.  This causes issues when using the -R option (FS#15851).

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
---
 scripts/makepkg.sh.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 56ad2c0b..cd41c4aa 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -953,6 +953,9 @@ create_package() {
 		exit 1 # $E_MISSING_PKGDIR
 	fi
 
+	cd "$pkgdir"
+	msg "$(gettext "Creating package...")"
+
 	if [ -z "$1" ]; then
 		nameofpkg="$pkgname"
 	else
@@ -961,9 +964,6 @@ create_package() {
 
 	write_pkginfo $nameofpkg
 
-	cd "$pkgdir"
-	msg "$(gettext "Creating package...")"
-
 	local comp_files=".PKGINFO"
 
 	# check for an install script
-- 
cgit v1.2.3