Merge branch '0.14'

3 files changed, 26 insertions, 17 deletions

diff --git a/i18n/messages.pot b/i18n/messages.pot
index 541496e..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-15 03:44+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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 portage 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/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"+_("<b>Note</b>: On fresh Sabayon installs or its LiveDVD/-CD, there is no portage tree existing per default.\nPlease run <i>emerge --sync &amp;&amp; layman -S</i>.")
 
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py
index 2c6d591..261b999 100644
--- a/portato/gui/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -1872,6 +1872,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 portage is not supported at the moment. See https://bugs.launchpad.net/portato/+bug/564292."))
+
         debug("All prereqs matched. Fine :)")
 
     def main (self):