public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-portage/gentoolkit/files: 0.3.0.4-setup-394909.patch
@ 2011-12-19 20:27 Paul Varner (fuzzyray)
  0 siblings, 0 replies; only message in thread
From: Paul Varner (fuzzyray) @ 2011-12-19 20:27 UTC (permalink / raw
  To: gentoo-commits

fuzzyray    11/12/19 20:27:29

  Added:                0.3.0.4-setup-394909.patch
  Log:
  Fix setup.py to work with EPREFIX changes in Portage (Bug 394909).
  
  (Portage version: 2.1.10.41/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch?rev=1.1&content-type=text/plain

Index: 0.3.0.4-setup-394909.patch
===================================================================
From 10aaed2b07c11065418d0e9e2c7aa52ae0837300 Mon Sep 17 00:00:00 2001
From: Paul Varner <fuzzyray@gentoo.org>
Date: Mon, 19 Dec 2011 13:38:40 -0600
Subject: [PATCH] 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(),
-- 
1.7.8







^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2011-12-19 20:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-19 20:27 [gentoo-commits] gentoo-x86 commit in app-portage/gentoolkit/files: 0.3.0.4-setup-394909.patch Paul Varner (fuzzyray)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox