From 8a03c532acd1527be2fc4b882ddafc09474da496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Fri, 16 Apr 2010 01:18:58 +0200 Subject: Do not allow portage's sqlite backend for the moment ... bug #564292 --- i18n/messages.pot | 38 ++++++++++++++++++++++---------------- portato/gui/windows/main.py | 3 +++ 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/i18n/messages.pot b/i18n/messages.pot index 541496e..8eccc2b 100644 --- a/i18n/messages.pot +++ b/i18n/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-15 03:44+0200\n" +"POT-Creation-Date: 2010-04-16 01:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -810,6 +810,12 @@ msgstr "" msgid "The portage tree seems to be empty." msgstr "" +#: portato/gui/windows/main.py:1875 +msgid "" +"The sqlite cache backend of portato is not supported at the moment. See " +"https://bugs.launchpad.net/portato/+bug/564292." +msgstr "" + #: portato/gui/session.py:21 msgid "Version mismatch." msgstr "" @@ -931,39 +937,39 @@ msgid "Invalid dependency string" msgstr "" #: portato/db/__init__.py:21 -msgid "SQLite" +msgid "eix + SQLite" msgstr "" #: portato/db/__init__.py:21 msgid "" -"Uses an SQLite-database to store package information.\n" -"May take longer to generate at the first time, but has advantages if portato " -"is re-started with an unchanged portage tree. Additionally it allows to use " -"fast SQL expressions for fetching the data." +"Similar to SQLite, but now uses the eix database to get the package " +"information.\n" +"This should be much faster on startup, but requires that your eix database " +"is always up-to-date.\n" +"Additionally, this is the only database allowing searching in descriptions." msgstr "" #: portato/db/__init__.py:22 -msgid "Hashmap" +msgid "SQLite" msgstr "" #: portato/db/__init__.py:22 msgid "" -"Uses an in-memory hashmap to store package information.\n" -"Has been used since at least version 0.3.3, but all information has to be " -"regenerated on each startup." +"Uses an SQLite-database to store package information.\n" +"May take longer to generate at the first time, but has advantages if portato " +"is re-started with an unchanged portage tree. Additionally it allows to use " +"fast SQL expressions for fetching the data." msgstr "" #: portato/db/__init__.py:23 -msgid "eix + SQLite" +msgid "Hashmap" msgstr "" #: portato/db/__init__.py:23 msgid "" -"Similar to SQLite, but now uses the eix database to get the package " -"information.\n" -"This should be much faster on startup, but requires that your eix database " -"is always up-to-date.\n" -"Additionally, this is the only database allowing searching in descriptions." +"Uses an in-memory hashmap to store package information.\n" +"Has been used since at least version 0.3.3, but all information has to be " +"regenerated on each startup." msgstr "" #: portato/db/__init__.py:45 diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index bdcb3c6..5e610ea 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -1871,6 +1871,9 @@ class MainWindow (Window): if not "eclass" in ls: fail(_("The portage tree seems to be empty.")) + if 'sqlite' in system.settings.settings.modules['user'].get('portdbapi.auxdbmodule', ''): + fail(_("The sqlite cache backend of portato is not supported at the moment. See https://bugs.launchpad.net/portato/+bug/564292.")) + debug("All prereqs matched. Fine :)") def main (self): -- cgit v1.2.3 From 389e70969d903f2c76fc62b6ba02254d4fa4710b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Fri, 16 Apr 2010 01:31:48 +0200 Subject: Typo --- i18n/messages.pot | 4 ++-- portato/gui/windows/main.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/messages.pot b/i18n/messages.pot index 8eccc2b..d649e90 100644 --- a/i18n/messages.pot +++ b/i18n/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-16 01:18+0200\n" +"POT-Creation-Date: 2010-04-16 01:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -812,7 +812,7 @@ msgstr "" #: portato/gui/windows/main.py:1875 msgid "" -"The sqlite cache backend of portato is not supported at the moment. See " +"The sqlite cache backend of portage is not supported at the moment. See " "https://bugs.launchpad.net/portato/+bug/564292." msgstr "" diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 5e610ea..de62f45 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -1872,7 +1872,7 @@ class MainWindow (Window): fail(_("The portage tree seems to be empty.")) if 'sqlite' in system.settings.settings.modules['user'].get('portdbapi.auxdbmodule', ''): - fail(_("The sqlite cache backend of portato is not supported at the moment. See https://bugs.launchpad.net/portato/+bug/564292.")) + fail(_("The sqlite cache backend of portage is not supported at the moment. See https://bugs.launchpad.net/portato/+bug/564292.")) debug("All prereqs matched. Fine :)") -- cgit v1.2.3 From ece9295ade05250c8b67712878a013a5ffc73567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Fri, 16 Apr 2010 01:37:11 +0200 Subject: Fix gtk deprecation warning --- portato/gui/dialogs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portato/gui/dialogs.py b/portato/gui/dialogs.py index 2cc2d6b..95f457b 100644 --- a/portato/gui/dialogs.py +++ b/portato/gui/dialogs.py @@ -128,7 +128,7 @@ def file_chooser_dialog (title, parent): def prereq_error_dialog (e): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("A prerequisite for starting Portato was not matched.")) - msg = e.message + msg = e.args[0] if get_runsystem()[0] == "Sabayon": msg += "\n\n"+_("Note: On fresh Sabayon installs or its LiveDVD/-CD, there is no portage tree existing per default.\nPlease run emerge --sync && layman -S.") -- cgit v1.2.3