[mypaint] Other method to find the right /usr/bin/mypaint proposed by Harald Hoyer
tomspur
tomspur at fedoraproject.org
Wed Sep 26 14:41:29 UTC 2012
commit 7c63228d73510d3f8ff6d0be95e1e8deb8f07727
Author: Thomas Spura <thomas.spura at gmail.com>
Date: Wed Sep 26 16:41:24 2012 +0200
Other method to find the right /usr/bin/mypaint proposed by Harald Hoyer
mypaint-1.0.0-usrmove.patch | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/mypaint-1.0.0-usrmove.patch b/mypaint-1.0.0-usrmove.patch
index fd9b8d7..1f09d10 100644
--- a/mypaint-1.0.0-usrmove.patch
+++ b/mypaint-1.0.0-usrmove.patch
@@ -1,13 +1,12 @@
diff -ur mypaint-1.0.0.orig/mypaint.py mypaint-1.0.0/mypaint.py
--- mypaint-1.0.0.orig/mypaint.py 2011-11-22 21:27:03.000000000 +0100
-+++ mypaint-1.0.0/mypaint.py 2012-09-26 16:21:40.125539307 +0200
-@@ -68,6 +68,9 @@
++++ mypaint-1.0.0/mypaint.py 2012-09-26 16:39:34.118393086 +0200
+@@ -64,7 +64,7 @@
+ # this script is installed as $prefix/bin. We just need $prefix to continue.
+ #pwd=os.getcwd() # why????
+ #dir_install=os.path.normpath(join(pwd,scriptdir)) # why????
+- dir_install=scriptdir # same, except maybe if scriptdir is relative...
++ dir_install=os.path.realpath(scriptdir) # same, except maybe if scriptdir is relative...
if os.path.basename(dir_install) == 'bin':
prefix=os.path.dirname(dir_install)
-+ if prefix == "/":
-+ # we have most likely a usrmoved system and disallow a prefix of /
-+ prefix = u"/usr"
- assert isinstance(prefix, unicode)
- libpath=join(prefix, lib_shared)
- libpath_compiled = join(prefix, lib_compiled)
More information about the scm-commits
mailing list