[Python-checkins] r86259 - tracker/instances/python-dev/scripts/addpatchsets

[martin.v.loewis]

Author: martin.v.loewis
Date: Sat Nov  6 13:44:54 2010
New Revision: 86259

Log:
Skip over patches missing Index: lines
Fix logic for storing n/a.


Modified:
   tracker/instances/python-dev/scripts/addpatchsets

Modified: tracker/instances/python-dev/scripts/addpatchsets
==============================================================================
--- tracker/instances/python-dev/scripts/addpatchsets	(original)
+++ tracker/instances/python-dev/scripts/addpatchsets	Sat Nov  6 13:44:54 2010
@@ -54,6 +54,9 @@
     split = engine.SplitPatch(data)
     # Check whether a prefix needs to be added to each file path
     prefixes = None
+    if not split:
+        # Missing Index: line in patch
+        return None, None
     for filename, data in split:
         c.execute('select prefix from fileprefix where suffix=%s', (filename,))
         res = c.fetchall()
@@ -155,9 +158,10 @@
     data = engine.UnifyLinebreaks(data)
     branch, bases = find_bases(data, int(f._revision))
     if not branch:
-        if nodeid < 15000:
+        if f.id < 15000:
             f._patchset = "n/a"
             f.save()
+            transaction.commit()
         continue
 
     blob = gae_db.Blob(data)