diff options
author | 2016-06-05 18:17:29 -0400 | |
---|---|---|
committer | 2016-06-05 18:17:29 -0400 | |
commit | 4ffb77e246b4c9c62fd18464589791fb27db4d36 (patch) | |
tree | d900e876e02bddfa1e6f0165cf6c4118400c2ebc /games-util | |
parent | games-util/pyfa: belated bump to 1.21.3 (diff) | |
download | gentoo-4ffb77e246b4c9c62fd18464589791fb27db4d36.tar.gz gentoo-4ffb77e246b4c9c62fd18464589791fb27db4d36.tar.bz2 gentoo-4ffb77e246b4c9c62fd18464589791fb27db4d36.zip |
games-util/pyfa: updated patch for live ebuild (bug #584624)
Thanks to Martin McCourt.
Package-Manager: portage-2.3.0_rc1
Diffstat (limited to 'games-util')
-rw-r--r-- | games-util/pyfa/files/pyfa-1.21.4-html-export-path.patch | 33 | ||||
-rw-r--r-- | games-util/pyfa/pyfa-9999.ebuild | 2 |
2 files changed, 34 insertions, 1 deletions
diff --git a/games-util/pyfa/files/pyfa-1.21.4-html-export-path.patch b/games-util/pyfa/files/pyfa-1.21.4-html-export-path.patch new file mode 100644 index 000000000000..f35dfcbd2d98 --- /dev/null +++ b/games-util/pyfa/files/pyfa-1.21.4-html-export-path.patch @@ -0,0 +1,33 @@ +From a596f7f5398f613a607ecc91e06ea651806b8b63 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Mon, 16 Jul 2012 05:43:38 -0400 +Subject: [PATCH] Export fits to home directory, not python sitedir + +--- + service/settings.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/service/settings.py b/service/settings.py +index cd1b33b..a883ca1 100644 +--- a/service/settings.py ++++ b/service/settings.py +@@ -21,6 +21,7 @@ import cPickle + import os.path + import config + import urllib2 ++import sys + + class SettingsProvider(): + BASE_PATH = os.path.join(config.savePath, "settings") +@@ -221,7 +222,7 @@ class HTMLExportSettings(): + return cls._instance + + def __init__(self): +- serviceHTMLExportDefaultSettings = {"enabled": False, "path": config.pyfaPath + os.sep + 'pyfaFits.html', "website": "null-sec.com", "minimal": False } ++ serviceHTMLExportDefaultSettings = {"enabled": False, "path": unicode(os.path.expanduser(os.path.join('~', 'pyfaFits.html')), sys.getfilesystemencoding()), "website": "null-sec.com", "minimal": False } + self.serviceHTMLExportSettings = SettingsProvider.getInstance().getSettings("pyfaServiceHTMLExportSettings", serviceHTMLExportDefaultSettings) + + def getEnabled(self): +-- +2.8.3 + diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild index 6f524e585066..e8c4d8bcdb14 100644 --- a/games-util/pyfa/pyfa-9999.ebuild +++ b/games-util/pyfa/pyfa-9999.ebuild @@ -42,7 +42,7 @@ src_prepare() { eapply "${FILESDIR}/${PN}-1.15.1-staticdata.patch" # do not try to save exported html to python sitedir - eapply "${FILESDIR}/${PN}-1.20.2-html-export-path.patch" + eapply "${FILESDIR}/${PN}-1.21.4-html-export-path.patch" # fix import path in the main script for systemwide installation eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch" |