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

fuzzyray    11/12/19 20:51:38

  Added:                1.0-fix-portage-eprefix-compatibility.patch
  Log:
  Fix setup.py to work with EPREFIX changes in Portage.
  
  (Portage version: 2.1.10.41/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-portage/esearch/files/1.0-fix-portage-eprefix-compatibility.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/esearch/files/1.0-fix-portage-eprefix-compatibility.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/esearch/files/1.0-fix-portage-eprefix-compatibility.patch?rev=1.1&content-type=text/plain

Index: 1.0-fix-portage-eprefix-compatibility.patch
===================================================================
From a160eedd0b176cfa3da755762a8e40a38b753114 Mon Sep 17 00:00:00 2001
From: Paul Varner <fuzzyray@gentoo.org>
Date: Mon, 19 Dec 2011 13:09:42 -0600
Subject: [PATCH] Fix setup.py to work with EPREFIX changes in Portage.

---
 setup.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 2990e33..b24cd8f 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ cwd = os.getcwd()
 try: 
 	from portage.const import EPREFIX 
 except ImportError: 
-	EPREFIX='/' 
+	EPREFIX='' 
 
 # Python files that need `__version__ = ""` subbed, relative to this dir:
 python_scripts = [os.path.join(cwd, path) for path in (
@@ -80,9 +80,9 @@ core.setup(
 	packages=packages,
 	scripts=(glob('bin/*')),
 	data_files=(
-		(os.path.join(EPREFIX, 'usr/share/man/man1'), glob('man/en/*')),
-		(os.path.join(EPREFIX, 'usr/share/man/fr/man1'), glob('man/fr/*')),
-		(os.path.join(EPREFIX, 'usr/share/man/it/man1'), glob('man/it/*')),
+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/man1'), glob('man/en/*')),
+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/fr/man1'), glob('man/fr/*')),
+		(os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/it/man1'), glob('man/it/*')),
 	),
 	cmdclass={
 		'set_version': set_version,
-- 
1.7.8







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

only message in thread, other threads:[~2011-12-19 20:51 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:51 [gentoo-commits] gentoo-x86 commit in app-portage/esearch/files: 1.0-fix-portage-eprefix-compatibility.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