← Back to branch summary

~kevang/mnemosyne-proj/grade-shortcuts-improvements

« back to all changes in this revision

Viewing changes to mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_db.py

  • Committer: Peter.Bienstman at UGent
  • Date: 2015-01-26 20:11:45 UTC
  • Revision ID: peter.bienstman@ugent.be-20150126201145-p9bbqlnjke0bgfys
merge card formatting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_db.py
39
39
        # Get config info to be merged.
40
40
        old_config_dir = self.config().config_dir
41
41
        self.config().config_dir = os.path.dirname(filename)
 
42
        self.log().active = False
42
43
        self.config().load()
43
44
        old_config = self.config().copy()
44
45
        self.config().config_dir = old_config_dir
45
 
        self.config().load()        
 
46
        self.config().load()
 
47
        self.log().active = True
46
48
        # Import the *.cards file into the receiving database.
47
49
        db.load(receiving_database_filename)
48
50
        log_index_before_import = db.current_log_index()