if media.db import fails, start anew

anki/media.py

@@ -3,6 +3,7 @@
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import re
+import traceback
 import urllib
 import unicodedata
 import sys
@@ -77,6 +78,7 @@ create table meta (dirMod int, lastUsn int); insert into meta values (0, 0);
     def maybeUpgrade(self):
         oldpath = self.dir()+".db"
         if os.path.exists(oldpath):
+            try:
                 self.db.execute('attach "../collection.media.db" as old')
                 self.db.execute("""
     insert into media
@@ -92,6 +94,10 @@ insert into meta select dirMod, usn from old.meta
                 self.db.execute("detach old")
                 self.db.commit()
                 self.db.execute("vacuum analyze")
+            except Exception, e:
+                # if we couldn't import the old db for some reason, just start
+                # anew
+                self.col.log("failed to import old media db:"+traceback.format_exc())
             os.rename("../collection.media.db", "../collection.media.db.old")
 
     def close(self):