summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-02-04 22:12:52 +0000
committerMike Frysinger <vapier@gentoo.org>2008-02-04 22:12:52 +0000
commitc9fd12b255d17343ff85fdc9d7e9439eb0c30ecf (patch)
treeeedcec5e786222eaa0a91ff6ac7e0e3703fecb39 /sys-apps/debianutils
parentx86 stable, bug #208749 (diff)
downloadgentoo-2-c9fd12b255d17343ff85fdc9d7e9439eb0c30ecf.tar.gz
gentoo-2-c9fd12b255d17343ff85fdc9d7e9439eb0c30ecf.tar.bz2
gentoo-2-c9fd12b255d17343ff85fdc9d7e9439eb0c30ecf.zip
Send which error output to /dev/null.
(Portage version: 2.1.4.1)
Diffstat (limited to 'sys-apps/debianutils')
-rw-r--r--sys-apps/debianutils/ChangeLog6
-rw-r--r--sys-apps/debianutils/debianutils-2.28.2.ebuild3
-rw-r--r--sys-apps/debianutils/files/debianutils-2.28.2-mkboot-quiet.patch22
3 files changed, 29 insertions, 2 deletions
diff --git a/sys-apps/debianutils/ChangeLog b/sys-apps/debianutils/ChangeLog
index 73418556b79a..15ad5f2b9474 100644
--- a/sys-apps/debianutils/ChangeLog
+++ b/sys-apps/debianutils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/debianutils
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.102 2008/01/23 08:13:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.103 2008/02/04 22:12:52 vapier Exp $
+
+ 04 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/debianutils-2.28.2-mkboot-quiet.patch, debianutils-2.28.2.ebuild:
+ Send which error output to /dev/null.
23 Jan 2008; Mike Frysinger <vapier@gentoo.org> debianutils-2.25.ebuild,
debianutils-2.28.2.ebuild:
diff --git a/sys-apps/debianutils/debianutils-2.28.2.ebuild b/sys-apps/debianutils/debianutils-2.28.2.ebuild
index 9a6b5855782a..c84a1f419434 100644
--- a/sys-apps/debianutils/debianutils-2.28.2.ebuild
+++ b/sys-apps/debianutils/debianutils-2.28.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-2.28.2.ebuild,v 1.4 2008/01/23 08:13:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-2.28.2.ebuild,v 1.5 2008/02/04 22:12:52 vapier Exp $
inherit eutils flag-o-matic
@@ -19,6 +19,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${PN}-2.28.2-no-bs-namespace.patch
+ epatch "${FILESDIR}"/${PN}-2.28.2-mkboot-quiet.patch
epatch "${FILESDIR}"/${PN}-2.16.2-palo.patch
}
diff --git a/sys-apps/debianutils/files/debianutils-2.28.2-mkboot-quiet.patch b/sys-apps/debianutils/files/debianutils-2.28.2-mkboot-quiet.patch
new file mode 100644
index 000000000000..7b1d64002b90
--- /dev/null
+++ b/sys-apps/debianutils/files/debianutils-2.28.2-mkboot-quiet.patch
@@ -0,0 +1,22 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=438443
+
+--- mkboot
++++ mkboot
+@@ -20,7 +20,7 @@
+ if mount | grep -q "^proc " && [ -e /proc/cmdline ]; then
+ rootpart=$(grep -o "root=[^ ]*" /proc/cmdline | cut -d \= -f 2)
+ else
+- which rdev >/dev/null && rootpart=$(rdev | cut -d ' ' -f 1)
++ which rdev >/dev/null 2>&1 && rootpart=$(rdev | cut -d ' ' -f 1)
+ fi
+ # temporary directory
+ tmpdir=${TMPDIR-/tmp}
+@@ -49,7 +49,7 @@
+
+ # check whether GRUB is installed
+ grubcheck () {
+- if ! which update-grub >/dev/null && ! which grub-install >/dev/null; then return 1; fi
++ if ! which update-grub >/dev/null 2>&1 && ! which grub-install >/dev/null 2>&1 ; then return 1; fi
+ }
+
+ # check whether Yaboot is installed