[kernel] r5216 - people/waldi/linux-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: Tue Jan  3 23:53:20 2006
New Revision: 5216

Modified:
   people/waldi/linux-2.6/debian/bin/apply.py
Log:
debian/bin/apply.py
- Use correct length in extra check.
- Check for correct length of extra entries.


Modified: people/waldi/linux-2.6/debian/bin/apply.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/apply.py	(original)
+++ people/waldi/linux-2.6/debian/bin/apply.py	Tue Jan  3 23:53:20 2006
@@ -169,9 +169,9 @@
             extra = {}
             for s in items[2:]:
                 s = tuple(s.split('_'))
-                if len(s) > 2:
+                if len(s) > 3:
                     raise RuntimeError, "parse error"
-                if len(s) == 2:
+                if len(s) == 3:
                     raise RuntimeError, "Patch per flavour is not supported currently"
                 extra[s] = True
             if not self._check_extra(extra):
@@ -181,7 +181,7 @@
 
     def _check_extra(self, extra):
         for i in (1, 2, 3):
-            t = tuple(self.extra[:1])
+            t = tuple(self.extra[:i])
             if extra.has_key(t):
                 if i > len(self.extra_used):
                     self.extra_used = t