diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2016-04-28 23:24:52 -0400 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2016-04-28 23:25:26 -0400 |
commit | f84cc674529981c0872915aad316a525b4f9f2c7 (patch) | |
tree | 69618af3c65dec6f1cf67085573fc3a70a01c5e3 /games-util | |
parent | dev-python/PyQt4: add 4.12 snapshot (diff) | |
download | gentoo-f84cc674529981c0872915aad316a525b4f9f2c7.tar.gz gentoo-f84cc674529981c0872915aad316a525b4f9f2c7.tar.bz2 gentoo-f84cc674529981c0872915aad316a525b4f9f2c7.zip |
games-util/pyfa: updated patch for live ebuild (bug #581460)
Thanks to Martin McCourt.
Package-Manager: portage-2.2.28
Diffstat (limited to 'games-util')
-rw-r--r-- | games-util/pyfa/files/pyfa-1.20.2-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.20.2-html-export-path.patch b/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch new file mode 100644 index 000000000000..b06906a83b58 --- /dev/null +++ b/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch @@ -0,0 +1,33 @@ +From dc07b64245459ff75c638dedc14ac86bdf9bc176 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 60627e6..7087e5c 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" } ++ serviceHTMLExportDefaultSettings = {"enabled": False, "path": unicode(os.path.expanduser(os.path.join('~', 'pyfaFits.html')), sys.getfilesystemencoding()), "website": "null-sec.com" } + self.serviceHTMLExportSettings = SettingsProvider.getInstance().getSettings("pyfaServiceHTMLExportSettings", serviceHTMLExportDefaultSettings) + + def getEnabled(self): +-- +2.8.1 + diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild index 0d2065a0b205..6f524e585066 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.1.8-html-export-path.patch" + eapply "${FILESDIR}/${PN}-1.20.2-html-export-path.patch" # fix import path in the main script for systemwide installation eapply "${FILESDIR}/${PN}-1.15.1-import-pyfa.patch" |