diff options
| author | Allan McRae <allan@archlinux.org> | 2009-08-08 19:21:50 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-08-08 11:12:05 -0500 |
| commit | 839bb562693d83aa61e996b492b731ff452a2bcd (patch) | |
| tree | 8d2baf5d28778ebc300256d33543274facc71747 /scripts | |
| parent | f16c7a4343c2e82d7ead0423c70495de5441b1ef (diff) | |
| download | pacman-839bb562693d83aa61e996b492b731ff452a2bcd.tar.xz | |
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 6 |
1 files changed, 3 insertions, 3 deletions
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 |