[kernel] r7144 - dists/sid/linux-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: Sat Aug 12 19:47:46 2006
New Revision: 7144

Modified:
   dists/sid/linux-2.6/debian/bin/apply.py

Log:
debian/bin/apply.py:
Disallow patching from not uptodate sources which have patches from the extra
series applied.


Modified: dists/sid/linux-2.6/debian/bin/apply.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/apply.py	(original)
+++ dists/sid/linux-2.6/debian/bin/apply.py	Sat Aug 12 19:47:46 2006
@@ -334,9 +334,12 @@
         return
 
     current_index = revisions.index(current.revision)
+    source_index = revisions.index(source.revision)
     target_index = revisions.index(target.revision)
 
     if current_extra:
+        if current_index != source_index:
+            raise RuntimeError, "Can't patch from %s with options %s" % (current, ' '.join(current_extra))
         consider = revisions[current_index:0:-1]
         s = series_extra.read_all(consider, home, current_extra, reverse = True)
         vfile.begin()