diff options
author | Ben Hutchings <benh@debian.org> | 2011-09-03 20:55:12 +0000 |
---|---|---|
committer | Ben Hutchings <benh@debian.org> | 2011-09-03 20:55:12 +0000 |
commit | cb043ef7397d9887ffdd4535ccd984711b151aa1 (patch) | |
tree | b8da025745f70261ac7bf6ac51a36140361d7fd2 /debian/lib/python/debian_linux/utils.py | |
parent | 07aafecfb1914954d1e7952555ab9baeaafc7a82 (diff) | |
download | kernel_replicant_linux-cb043ef7397d9887ffdd4535ccd984711b151aa1.tar.gz kernel_replicant_linux-cb043ef7397d9887ffdd4535ccd984711b151aa1.tar.bz2 kernel_replicant_linux-cb043ef7397d9887ffdd4535ccd984711b151aa1.zip |
Fix debian_linux.utils.read_control to tolerate extra blank lines
svn path=/dists/trunk/linux-2.6/; revision=18042
Diffstat (limited to 'debian/lib/python/debian_linux/utils.py')
-rw-r--r-- | debian/lib/python/debian_linux/utils.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/lib/python/debian_linux/utils.py b/debian/lib/python/debian_linux/utils.py index 0c17884f23d7..4057177da780 100644 --- a/debian/lib/python/debian_linux/utils.py +++ b/debian/lib/python/debian_linux/utils.py @@ -71,14 +71,16 @@ def read_control(f): from .debian import Package entries = [] + eof = False - while True: + while not eof: e = Package() last = None lines = [] while True: line = f.readline() if not line: + eof = True break line = line.strip('\n') if not line: @@ -97,10 +99,8 @@ def read_control(f): lines = [line[i+1:].lstrip()] if last: e[last] = '\n'.join(lines) - if not e: - break - - entries.append(e) + if e: + entries.append(e) return entries |