[gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/

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:master commit in: bin/ebuild-helpers/
Date: Mon, 11 Apr 2011 23:29:11 +0000 (UTC)	[thread overview]
Message-ID: <2e334d77e3d1836ab6ba5dfc1700e90f9599d4d3.zmedico@gentoo> (raw)

commit:     2e334d77e3d1836ab6ba5dfc1700e90f9599d4d3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 23:23:54 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 23:23:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2e334d77

doins: dereference abs symlinks to files

Our fake $DISTDIR contains symlinks that should not be reproduced
inside $D. In order to ensure that things like dodoc
"$DISTDIR"/foo.pdf work as expected, we dereference symlinked files
that are referenced by absolute paths. Thanks to James Cloos
<cloos <AT> jhcloos.com> for reporting this issue which he observed with
the sci-mathematics/minisat ebuild.

---
 bin/ebuild-helpers/doins |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index 0aedcb9..3daa9a0 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -55,7 +55,13 @@ _doins() {
 	local mysrc="$1" mydir="$2" cleanup="" rval
 
 	if [ -L "$mysrc" ] ; then
-		if [ $PRESERVE_SYMLINKS = y ] ; then
+		# Our fake $DISTDIR contains symlinks that should
+		# not be reproduced inside $D. In order to ensure
+		# that things like dodoc "$DISTDIR"/foo.pdf work
+		# as expected, we dereference symlinked files that
+		# are referenced by absolute paths.
+		if [ $PRESERVE_SYMLINKS = y ] && \
+			! [[ -f "$mysrc" && $(readlink "$mysrc") == /* ]] ; then
 			rm -rf "$D$INSDESTTREE/$mydir/${mysrc##*/}" || return $?
 			cp -P "$mysrc" "$D$INSDESTTREE/$mydir/${mysrc##*/}"
 			return $?

next             reply	other threads:[~2011-04-11 23:29 UTC|newest]

Thread overview: 115+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-11 23:29 Zac Medico [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-31 14:21 [gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/ Ulrich Müller
2023-10-26 17:08 Ulrich Müller
2023-10-21 19:23 Ulrich Müller
2023-10-21 19:23 Ulrich Müller
2023-06-07  9:02 Ulrich Müller
2023-06-07  7:16 Ulrich Müller
2023-05-11 20:19 Sam James
2023-05-11 20:19 Sam James
2023-04-30 19:31 Ulrich Müller
2023-04-30 19:31 Ulrich Müller
2023-04-06  8:08 Ulrich Müller
2023-04-06  8:08 Ulrich Müller
2022-07-27 19:05 Fabian Groffen
2022-06-26 18:08 Mike Gilbert
2020-01-23  5:58 Zac Medico
2019-10-02 22:22 Ulrich Müller
2018-12-22  0:08 Zac Medico
2018-09-17 18:18 Michał Górny
2018-09-17  6:45 Michał Górny
2018-09-17  6:45 Michał Górny
2018-09-17  6:45 Michał Górny
2018-05-04 15:56 Zac Medico
2018-03-14 17:04 Michał Górny
2018-03-11 11:44 Michał Górny
2018-03-08 21:50 Michał Górny
2018-03-04  2:41 Zac Medico
2018-02-05  4:39 Zac Medico
2017-12-15 21:07 Zac Medico
2017-10-16 17:16 Zac Medico
2017-07-09 21:35 Michał Górny
2017-04-20 20:40 Michał Górny
2017-04-20 17:21 Ulrich Müller
2015-05-14 19:05 Brian Dolbec
2015-05-14  9:43 Mike Frysinger
2014-10-19 17:33 Zac Medico
2014-01-05 14:42 Mike Frysinger
2013-09-09 17:44 Zac Medico
2013-09-09 17:11 Zac Medico
2013-08-21 19:21 Zac Medico
2013-08-02 17:42 Zac Medico
2013-05-21 21:37 Zac Medico
2013-05-12 20:52 Zac Medico
2013-04-01  7:22 Zac Medico
2013-03-20 19:16 Mike Frysinger
2013-03-20  8:33 Mike Frysinger
2013-03-14  3:30 Zac Medico
2013-03-14  3:30 Zac Medico
2013-03-14  3:30 Zac Medico
2013-02-15 23:40 Zac Medico
2012-12-11  9:00 Zac Medico
2012-12-10 22:05 Zac Medico
2012-12-01 21:41 Zac Medico
2012-12-01 21:19 Zac Medico
2012-12-01 21:19 Zac Medico
2012-12-01  3:37 Zac Medico
2012-11-06  8:28 Zac Medico
2012-11-06  6:14 Zac Medico
2012-11-06  5:42 Zac Medico
2012-11-05  2:51 Zac Medico
2012-09-27  2:05 Zac Medico
2012-09-26 21:43 Zac Medico
2012-09-17  1:27 Zac Medico
2012-09-01 22:51 Zac Medico
2012-08-31 15:21 Ulrich Mueller
2012-08-25 21:13 Ulrich Mueller
2012-08-25 20:01 Zac Medico
2012-08-25 19:46 Zac Medico
2012-08-25 19:46 Zac Medico
2012-08-23 22:29 Zac Medico
2012-08-11 19:11 Zac Medico
2012-07-15 21:29 Zac Medico
2012-06-02  4:06 Zac Medico
2012-06-02  2:45 Zac Medico
2012-06-02  2:37 Zac Medico
2012-06-02  2:28 Zac Medico
2012-05-14 22:56 Zac Medico
2012-05-14 22:38 Zac Medico
2012-05-14 22:03 Zac Medico
2012-05-14 21:11 Zac Medico
2012-05-14 20:53 Zac Medico
2012-05-14 20:20 Mike Frysinger
2012-05-14 20:13 Zac Medico
2012-05-14 18:51 Mike Frysinger
2012-05-14 18:51 Mike Frysinger
2012-05-14  8:42 Zac Medico
2012-05-14  8:29 Zac Medico
2012-03-29 22:26 Zac Medico
2012-03-29 22:12 Zac Medico
2012-03-29 22:03 Zac Medico
2012-02-22 20:51 Zac Medico
2012-01-21 21:33 Zac Medico
2012-01-14 21:37 Mike Frysinger
2011-12-22 22:17 Zac Medico
2011-12-21 19:30 Zac Medico
2011-12-20  0:00 Zac Medico
2011-11-08 19:25 Zac Medico
2011-11-07  8:14 Zac Medico
2011-10-11 17:29 Mike Frysinger
2011-10-11 14:24 Mike Frysinger
2011-10-11 14:24 Mike Frysinger
2011-10-11  2:28 Mike Frysinger
2011-10-10  6:27 Zac Medico
2011-10-10  6:04 Zac Medico
2011-10-10  2:29 Mike Frysinger
2011-10-10  2:29 Mike Frysinger
2011-10-10  2:29 Mike Frysinger
2011-08-22 17:35 Zac Medico
2011-08-22 16:06 Zac Medico
2011-06-30  8:18 Zac Medico
2011-06-30  8:07 Zac Medico
2011-05-04 16:41 Zac Medico
2011-03-02  4:53 Zac Medico
2011-02-25 20:33 Zac Medico
2011-02-25 20:11 Zac Medico

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:0aedcb9 dfblob:3daa9a0 )
 OR (
bs:"[gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/" )
	(help)

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=2e334d77e3d1836ab6ba5dfc1700e90f9599d4d3.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