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>
This commit is contained in:
parent
f16c7a4343
commit
839bb56269
1 changed files with 3 additions and 3 deletions
|
@ -953,6 +953,9 @@ create_package() {
|
||||||
exit 1 # $E_MISSING_PKGDIR
|
exit 1 # $E_MISSING_PKGDIR
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cd "$pkgdir"
|
||||||
|
msg "$(gettext "Creating package...")"
|
||||||
|
|
||||||
if [ -z "$1" ]; then
|
if [ -z "$1" ]; then
|
||||||
nameofpkg="$pkgname"
|
nameofpkg="$pkgname"
|
||||||
else
|
else
|
||||||
|
@ -961,9 +964,6 @@ create_package() {
|
||||||
|
|
||||||
write_pkginfo $nameofpkg
|
write_pkginfo $nameofpkg
|
||||||
|
|
||||||
cd "$pkgdir"
|
|
||||||
msg "$(gettext "Creating package...")"
|
|
||||||
|
|
||||||
local comp_files=".PKGINFO"
|
local comp_files=".PKGINFO"
|
||||||
|
|
||||||
# check for an install script
|
# check for an install script
|
||||||
|
|
Loading…
Add table
Reference in a new issue