diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-12 21:03:20 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-12 21:03:20 +0200 |
| commit | 668c676ac5acc28559381aae13688798104458b5 (patch) | |
| tree | 31dc35e8c4396fd53ed5d18d9d3a7851669e3a6f /portato | |
| parent | 1f7f06f92bb910a0b1e025055b252478e5727fb3 (diff) | |
| parent | 39f786c905e1e78c283a1d3939876b0e6b1f86c4 (diff) | |
| download | portato-668c676ac5acc28559381aae13688798104458b5.tar.gz portato-668c676ac5acc28559381aae13688798104458b5.tar.bz2 portato-668c676ac5acc28559381aae13688798104458b5.zip | |
Merge branch '0.14'
Diffstat (limited to 'portato')
| -rw-r--r-- | portato/db/sql.py | 2 | ||||
| -rw-r--r-- | portato/eix/parser.pyx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/portato/db/sql.py b/portato/db/sql.py index c248c9a..f3b93f0 100644 --- a/portato/db/sql.py +++ b/portato/db/sql.py @@ -45,7 +45,7 @@ class SQLDatabase (Database): updateFormat = False if "format" not in session or session["format"] != self.FORMAT: - debug("Need to update database format from '%s' to '%s'", session["format"], self.FORMAT) + debug("Need to update database format from '%s' to '%s'", session.get("format", "undefined"), self.FORMAT) session["format"] = self.FORMAT updateFormat = True diff --git a/portato/eix/parser.pyx b/portato/eix/parser.pyx index d4bd3af..6363b37 100644 --- a/portato/eix/parser.pyx +++ b/portato/eix/parser.pyx @@ -279,7 +279,7 @@ cdef class package: after_offset = ftell(cfile) self.name = string(file) - self.description = string(file) + self.description = unicode(string(file)) # skip the rest, as it is currently unneeded #self.provide = vector(file, number) |