From 82f9d484da4a01fc4076c77a47a0a4226dbd8141 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sat, 29 Oct 2011 20:11:37 +0900
Subject: [PATCH] don't die on non-field references

---
 anki/upgrade.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/anki/upgrade.py b/anki/upgrade.py
index a05f23767..197b303c7 100644
--- a/anki/upgrade.py
+++ b/anki/upgrade.py
@@ -441,8 +441,13 @@ order by ordinal""", mid)):
                 f = deck.models.newField(fld)
                 deck.models.addField(m, f)
                 # get field name and any prefix/suffix
-                pre, ofld, suf = re.match(
-                    "([^{]*)\{\{\{?(?:text:)?([^}]+)\}\}\}?(.*)", fname).groups()
+                m2 = re.match(
+                    "([^{]*)\{\{\{?(?:text:)?([^}]+)\}\}\}?(.*)",
+                    fname)
+                # not a field reference?
+                if not m2:
+                    return
+                pre, ofld, suf = m2.groups()
                 # get index of field name
                 idx = deck.models.fieldMap(m)[ofld][0]
                 # loop through facts and write reference into new field