From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QghyI-0005Bj-B9 for garchives@archives.gentoo.org; Tue, 12 Jul 2011 18:46:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96DD621C030; Tue, 12 Jul 2011 18:46:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6575021C030 for ; Tue, 12 Jul 2011 18:46:06 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01D912AC215 for ; Tue, 12 Jul 2011 18:46:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 58F808003D for ; Tue, 12 Jul 2011 18:46:05 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <197ab88070b624296a9779da827fc194df95c32e.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/misc-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 197ab88070b624296a9779da827fc194df95c32e Date: Tue, 12 Jul 2011 18:46:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7164832a75c89483be30bcb44fc11223 commit: 197ab88070b624296a9779da827fc194df95c32e Author: Zac Medico gentoo org> AuthorDate: Tue Jul 12 18:45:41 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Jul 12 18:45:41 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D197ab880 misc-functions.sh: fix incorrect has -o usage --- bin/misc-functions.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index a4f103d..8c191ff 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -773,7 +773,7 @@ preinst_mask() { install_mask "${D}" "${INSTALL_MASK}" =20 # remove share dir if unnessesary - if has nodoc $FEATURES -o has noman $FEATURES -o has noinfo $FEATURES; = then + if has nodoc $FEATURES || has noman $FEATURES || has noinfo $FEATURES; = then rmdir "${D}usr/share" &> /dev/null fi }