1 |
commit: f84cc674529981c0872915aad316a525b4f9f2c7 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 29 03:24:52 2016 +0000 |
4 |
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 29 03:25:26 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f84cc674 |
7 |
|
8 |
games-util/pyfa: updated patch for live ebuild (bug #581460) |
9 |
|
10 |
Thanks to Martin McCourt. |
11 |
|
12 |
Package-Manager: portage-2.2.28 |
13 |
|
14 |
.../pyfa/files/pyfa-1.20.2-html-export-path.patch | 33 ++++++++++++++++++++++ |
15 |
games-util/pyfa/pyfa-9999.ebuild | 2 +- |
16 |
2 files changed, 34 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch b/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch |
19 |
new file mode 100644 |
20 |
index 0000000..b06906a |
21 |
--- /dev/null |
22 |
+++ b/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch |
23 |
@@ -0,0 +1,33 @@ |
24 |
+From dc07b64245459ff75c638dedc14ac86bdf9bc176 Mon Sep 17 00:00:00 2001 |
25 |
+From: Alexandre Rostovtsev <tetromino@g.o> |
26 |
+Date: Mon, 16 Jul 2012 05:43:38 -0400 |
27 |
+Subject: [PATCH] Export fits to home directory, not python sitedir |
28 |
+ |
29 |
+--- |
30 |
+ service/settings.py | 3 ++- |
31 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
32 |
+ |
33 |
+diff --git a/service/settings.py b/service/settings.py |
34 |
+index 60627e6..7087e5c 100644 |
35 |
+--- a/service/settings.py |
36 |
++++ b/service/settings.py |
37 |
+@@ -21,6 +21,7 @@ import cPickle |
38 |
+ import os.path |
39 |
+ import config |
40 |
+ import urllib2 |
41 |
++import sys |
42 |
+ |
43 |
+ class SettingsProvider(): |
44 |
+ BASE_PATH = os.path.join(config.savePath, "settings") |
45 |
+@@ -221,7 +222,7 @@ class HTMLExportSettings(): |
46 |
+ return cls._instance |
47 |
+ |
48 |
+ def __init__(self): |
49 |
+- serviceHTMLExportDefaultSettings = {"enabled": False, "path": config.pyfaPath + os.sep + 'pyfaFits.html', "website": "null-sec.com" } |
50 |
++ serviceHTMLExportDefaultSettings = {"enabled": False, "path": unicode(os.path.expanduser(os.path.join('~', 'pyfaFits.html')), sys.getfilesystemencoding()), "website": "null-sec.com" } |
51 |
+ self.serviceHTMLExportSettings = SettingsProvider.getInstance().getSettings("pyfaServiceHTMLExportSettings", serviceHTMLExportDefaultSettings) |
52 |
+ |
53 |
+ def getEnabled(self): |
54 |
+-- |
55 |
+2.8.1 |
56 |
+ |
57 |
|
58 |
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild |
59 |
index 0d2065a..6f524e5 100644 |
60 |
--- a/games-util/pyfa/pyfa-9999.ebuild |
61 |
+++ b/games-util/pyfa/pyfa-9999.ebuild |
62 |
@@ -42,7 +42,7 @@ src_prepare() { |
63 |
eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch" |
64 |
|
65 |
# do not try to save exported html to python sitedir |
66 |
- eapply "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" |
67 |
+ eapply "${FILESDIR}/${PN}-1.20.2-html-export-path.patch" |
68 |
|
69 |
# fix import path in the main script for systemwide installation |
70 |
eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch" |