Skip to content

Commit 4682ea8

Browse files
authored
Merge pull request aurutils#1199 from aurutils/logdest-fixup
`build`: do not define `LOGDEST` explicitly
2 parents d763e38 + a1ec5d3 commit 4682ea8

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ETCDIR ?= /etc
77
AURUTILS_LIB_DIR ?= $(LIBDIR)/$(PROGNM)
88
AURUTILS_VERSION ?= $(shell git describe --tags || true)
99
ifeq ($(AURUTILS_VERSION),)
10-
AURUTILS_VERSION := 20.5
10+
AURUTILS_VERSION := 20.5.1
1111
endif
1212
AURUTILS_LIB = $(shell find lib/ -name 'aur-*')
1313

lib/pacman/aur-build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,11 @@ while IFS= read "${read_args[@]}" -ru "$fd" path; do
407407

408408
if (( create_package )); then
409409
if (( chroot )); then
410-
env PKGDEST="$var_tmp" LOGDEST="${LOGDEST:-$PWD}" "${makepkg_env[@]}" \
410+
env PKGDEST="$var_tmp" "${makepkg_env[@]}" \
411411
aur chroot "${chroot_args[@]}" --build "${chroot_build_args[@]}"
412412
else
413413
#shellcheck disable=SC2086
414-
env PKGDEST="$var_tmp" LOGDEST="${LOGDEST:-$PWD}" "${makepkg_env[@]}" \
414+
env PKGDEST="$var_tmp" "${makepkg_env[@]}" \
415415
${AUR_MAKEPKG:-makepkg} "${makepkg_common_args[@]}" "${makepkg_args[@]}"
416416
fi
417417

makepkg/aurutils.changelog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 20.5.1
2+
3+
* `aur-build`
4+
+ do not define `LOGDEST` explicitly
5+
16
## 20.5
27

38
* `aur-chroot`

0 commit comments

Comments
 (0)