From c53c503013d2450f2c04d8b8996b5211d129bd73 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 12 Aug 2006 19:47:46 +0000 Subject: debian/bin/apply.py: Disallow patching from not uptodate sources which have patches from the extra series applied. svn path=/dists/sid/linux-2.6/; revision=7144 --- debian/bin/apply.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/bin/apply.py b/debian/bin/apply.py index 2cf69e064853..4e3e5a81f56a 100755 --- a/debian/bin/apply.py +++ b/debian/bin/apply.py @@ -334,9 +334,12 @@ def main(): 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() -- cgit v1.2.3