diff options
| author | Bastian Blank <waldi@debian.org> | 2006-08-12 19:47:46 +0000 |
|---|---|---|
| committer | Bastian Blank <waldi@debian.org> | 2006-08-12 19:47:46 +0000 |
| commit | c53c503013d2450f2c04d8b8996b5211d129bd73 (patch) | |
| tree | 9104c78d65f335eb1a4f08959e68aaf78955d81b | |
| parent | 6d0bf6aead75b6e9e8ef83f5012496814c7a0ce7 (diff) | |
| download | kernel_replicant_linux-c53c503013d2450f2c04d8b8996b5211d129bd73.tar.gz kernel_replicant_linux-c53c503013d2450f2c04d8b8996b5211d129bd73.tar.bz2 kernel_replicant_linux-c53c503013d2450f2c04d8b8996b5211d129bd73.zip | |
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
| -rwxr-xr-x | debian/bin/apply.py | 3 |
1 files changed, 3 insertions, 0 deletions
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() |