public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:2.1.9 commit in: man/, bin/, doc/package/ebuild/eapi/
Date: Sun, 20 Feb 2011 00:04:19 +0000 (UTC)	[thread overview]
Message-ID: <68ca90d75caab59d5a33a8ca4f2dfb7c57474a04.zmedico@gentoo> (raw)

commit:     68ca90d75caab59d5a33a8ca4f2dfb7c57474a04
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 23:27:32 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 00:03:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=68ca90d7

_eapi4_src_install: handle empty DOCS like PMS

This will fix bug #355635.

---
 bin/ebuild.sh                     |    2 +-
 doc/package/ebuild/eapi/4.docbook |    2 +-
 man/ebuild.5                      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index d0cf84d..8abdec9 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -671,7 +671,7 @@ _eapi4_src_install() {
 		emake DESTDIR="${D}" install
 	fi
 
-	if [[ -z $DOCS ]] ; then
+	if ! declare -p DOCS &>/dev/null ; then
 		local d
 		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
 				THANKS BUGS FAQ CREDITS CHANGELOG ; do

diff --git a/doc/package/ebuild/eapi/4.docbook b/doc/package/ebuild/eapi/4.docbook
index c379d11..83ba0dd 100644
--- a/doc/package/ebuild/eapi/4.docbook
+++ b/doc/package/ebuild/eapi/4.docbook
@@ -263,7 +263,7 @@ src_install() {
 		emake DESTDIR="${D}" install
 	fi
 
-	if [[ -z $DOCS ]] ; then
+	if ! declare -p DOCS &amp;>/dev/null ; then
 		local d
 		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \
 				THANKS BUGS FAQ CREDITS CHANGELOG ; do

diff --git a/man/ebuild.5 b/man/ebuild.5
index dd6a31b..1067f82 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -700,7 +700,7 @@ src_install() {
         emake DESTDIR="${D}" install
     fi
 
-    if [[ \-z $DOCS ]] ; then
+    if ! declare -p DOCS &>/dev/null ; then
         local d
         for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \\
                 THANKS BUGS FAQ CREDITS CHANGELOG ; do



                 reply	other threads:[~2011-02-20  0:05 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=68ca90d75caab59d5a33a8ca4f2dfb7c57474a04.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox