The Mnemosyne Project

Merge lp:~viashimo/mnemosyne-proj/mnemosyne-proj into lp:~peter-bienstman/mnemosyne-proj/trunk

  1. mnemosyne-proj
  2. Merge into trunk
Proposed by Kienan
Status: Merged
Merge reported by: Peter Bienstman
Merged at revision: not available
Proposed branch: lp:~viashimo/mnemosyne-proj/mnemosyne-proj
Merge into: lp:~peter-bienstman/mnemosyne-proj/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py (+1/-1)
To merge this branch: bzr merge lp:~viashimo/mnemosyne-proj/mnemosyne-proj
Reviewer Review Type Date Requested Status
Peter Bienstman Approve
Review via email: mp+311675@code.launchpad.net

Description of the change

Fix for crash creating database running with --sync-server. See launchpad #1644398

To post a comment you must log in.
Revision history for this message
Peter Bienstman (peter-bienstman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py'
2--- mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py 2016-03-01 20:28:57 +0000
3+++ mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py 2016-11-24 02:04:07 +0000
4@@ -340,7 +340,7 @@
5 self.unload()
6 self._path = expand_path(path, self.config().data_dir)
7 if not os.path.exists(self._path):
8- return new(path)
9+ return self.new(path)
10 # Check database version.
11 try:
12 sql_res = self.con.execute("""select value from global_variables

Subscribers

People subscribed via source and target branches