From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 22 Dec 2019 08:10:22 +0000 (+0100)
Subject: sys-kernel/vanilla-kernel: [QA] Fix missing eend arg
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4d5aa2d2dfed50fc9af57ac587bb851ee5c8540b;p=gentoo.git

sys-kernel/vanilla-kernel: [QA] Fix missing eend arg

Closes: https://bugs.gentoo.org/703512
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.2.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.2.ebuild
index ef5bf85d7eb6..e4aec6aa7ea9 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.2.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.2.ebuild
@@ -139,7 +139,7 @@ pkg_postinst() {
 			# putting it alongside kernel image as 'initrd' makes
 			# kernel-install happier
 			dracut --force "${EROOT}/usr/src/linux-${PV}/initrd" "${PV}"
-			eend || die "Building initramfs failed"
+			eend ${?} || die "Building initramfs failed"
 		fi
 
 		ebegin "Installing the kernel via installkernel"
@@ -148,7 +148,7 @@ pkg_postinst() {
 		installkernel "${PV}" \
 			"${EROOT}/usr/src/linux-${PV}/bzImage" \
 			"${EROOT}/usr/src/linux-${PV}/System.map"
-		eend || fail=1
+		eend ${?} || fail=1
 
 		[[ ${fail} ]] && die "Installing the kernel failed"
 
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.3.ebuild
index ef5bf85d7eb6..e4aec6aa7ea9 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.3.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.3.ebuild
@@ -139,7 +139,7 @@ pkg_postinst() {
 			# putting it alongside kernel image as 'initrd' makes
 			# kernel-install happier
 			dracut --force "${EROOT}/usr/src/linux-${PV}/initrd" "${PV}"
-			eend || die "Building initramfs failed"
+			eend ${?} || die "Building initramfs failed"
 		fi
 
 		ebegin "Installing the kernel via installkernel"
@@ -148,7 +148,7 @@ pkg_postinst() {
 		installkernel "${PV}" \
 			"${EROOT}/usr/src/linux-${PV}/bzImage" \
 			"${EROOT}/usr/src/linux-${PV}/System.map"
-		eend || fail=1
+		eend ${?} || fail=1
 
 		[[ ${fail} ]] && die "Installing the kernel failed"
 
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.5.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.5.ebuild
index 37b591ff1c59..f8f219fc594e 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.5.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.5.ebuild
@@ -139,7 +139,7 @@ pkg_postinst() {
 			# putting it alongside kernel image as 'initrd' makes
 			# kernel-install happier
 			dracut --force "${EROOT}/usr/src/linux-${PV}/initrd" "${PV}"
-			eend || die "Building initramfs failed"
+			eend ${?} || die "Building initramfs failed"
 		fi
 
 		ebegin "Installing the kernel via installkernel"
@@ -148,7 +148,7 @@ pkg_postinst() {
 		installkernel "${PV}" \
 			"${EROOT}/usr/src/linux-${PV}/bzImage" \
 			"${EROOT}/usr/src/linux-${PV}/System.map"
-		eend || fail=1
+		eend ${?} || fail=1
 
 		[[ ${fail} ]] && die "Installing the kernel failed"
 	fi
@@ -164,7 +164,7 @@ pkg_postinst() {
 		then
 			ebegin "Updating /usr/src/linux symlink"
 			ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
-			eend
+			eend $?
 		fi
 	fi
 
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.6.ebuild
index 37b591ff1c59..5c4d4d67350d 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.6.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.6.ebuild
@@ -132,14 +132,12 @@ pkg_postinst() {
 	if [[ -z ${ROOT} ]]; then
 		mount-boot_pkg_preinst
 
-		local fail=
-
 		if use initramfs; then
 			ebegin "Building initramfs via dracut"
 			# putting it alongside kernel image as 'initrd' makes
 			# kernel-install happier
 			dracut --force "${EROOT}/usr/src/linux-${PV}/initrd" "${PV}"
-			eend || die "Building initramfs failed"
+			eend ${?} || die "Building initramfs failed"
 		fi
 
 		ebegin "Installing the kernel via installkernel"
@@ -148,9 +146,7 @@ pkg_postinst() {
 		installkernel "${PV}" \
 			"${EROOT}/usr/src/linux-${PV}/bzImage" \
 			"${EROOT}/usr/src/linux-${PV}/System.map"
-		eend || fail=1
-
-		[[ ${fail} ]] && die "Installing the kernel failed"
+		eend ${?} || die "Installing the kernel failed"
 	fi
 
 	local symlink_target=$(readlink "${EROOT}"/usr/src/linux)
@@ -164,7 +160,7 @@ pkg_postinst() {
 		then
 			ebegin "Updating /usr/src/linux symlink"
 			ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
-			eend
+			eend ${?}
 		fi
 	fi