public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Paul Varner" <fuzzyray@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoolkit:gentoolkit commit in: /
Date: Mon, 19 Dec 2011 19:40:01 +0000 (UTC)	[thread overview]
Message-ID: <10aaed2b07c11065418d0e9e2c7aa52ae0837300.fuzzyray@gentoo> (raw)

commit:     10aaed2b07c11065418d0e9e2c7aa52ae0837300
Author:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 19:38:40 2011 +0000
Commit:     Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 19:38:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=10aaed2b

Fix setup.py to work with EPREFIX changes in Portage (Bug 394909).

---
 setup.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index f65a933..1efba94 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ cwd = os.getcwd()
 try: 
 	from portage.const import EPREFIX 
 except ImportError: 
-	EPREFIX='/' 
+	EPREFIX='' 
 
 
 # Bash files that need `VERSION=""` subbed, relative to this dir:
@@ -127,10 +127,10 @@ core.setup(
 	package_data = test_data,
 	scripts=(glob('bin/*')),
 	data_files=(
-		(os.path.join(EPREFIX, 'etc/env.d'), ['data/99gentoolkit-env']),
-		(os.path.join(EPREFIX, 'etc/revdep-rebuild'), ['data/revdep-rebuild/99revdep-rebuild']),
-		(os.path.join(EPREFIX, 'etc/eclean'), glob('data/eclean/*')),
-		(os.path.join(EPREFIX, 'usr/share/man/man1'), glob('man/*')),
+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/env.d'), ['data/99gentoolkit-env']),
+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/revdep-rebuild'), ['data/revdep-rebuild/99revdep-rebuild']),
+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/eclean'), glob('data/eclean/*')),
+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/man1'), glob('man/*')),
 	),
 	cmdclass={
 		'test': load_test(),



             reply	other threads:[~2011-12-19 19:40 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-19 19:40 Paul Varner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-11-12  7:16 [gentoo-commits] proj/gentoolkit:gentoolkit commit in: / Slawek Lis
2014-08-29  4:04 Brian Dolbec
2014-01-21 11:25 slis
2013-11-02 17:50 Paul Varner
2013-09-05 14:47 Paul Varner
2013-01-04  2:31 Paul Varner
2013-01-02 23:12 Paul Varner
2012-12-23  1:53 Brian Dolbec
2012-12-22 17:12 Brian Dolbec
2012-12-18 10:42 Paul Varner
2012-06-29  2:24 Brian Dolbec
2012-02-06 16:23 Paul Varner
2011-07-14  1:44 Brian Dolbec
2011-05-29 10:59 Christian Ruppert
2011-05-12  2:55 Paul Varner
2011-05-12  2:55 Paul Varner
2011-02-23  9:10 Brian Dolbec

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=10aaed2b07c11065418d0e9e2c7aa52ae0837300.fuzzyray@gentoo \
    --to=fuzzyray@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