mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-23 00:08:50 -05:00
makepkg: check for non-empty pkgbase instead of pkgname
pkgbase is used in the following rm calls, and since pkgname can be present when pkgbase is not, it is safer to check for pkgbase. Signed-off-by: Cedric Staniewski <cedric@gmx.ca> Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
e09253d15b
commit
335627d72d
@ -155,7 +155,7 @@ clean_up() {
|
|||||||
# If it's a clean exit and -c/--clean has been passed...
|
# If it's a clean exit and -c/--clean has been passed...
|
||||||
msg "$(gettext "Cleaning up...")"
|
msg "$(gettext "Cleaning up...")"
|
||||||
rm -rf "$pkgdir" "$srcdir"
|
rm -rf "$pkgdir" "$srcdir"
|
||||||
if [ -n "$pkgname" ]; then
|
if [ -n "$pkgbase" ]; then
|
||||||
# Can't do this unless the BUILDSCRIPT has been sourced.
|
# Can't do this unless the BUILDSCRIPT has been sourced.
|
||||||
rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"*
|
rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"*
|
||||||
if [ "$PKGFUNC" -eq 1 ]; then
|
if [ "$PKGFUNC" -eq 1 ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user