Fix debian_linux.utils.read_control to tolerate extra blank lines
Cherry-picked from trunk r18042. svn path=/dists/sid/linux-2.6/; revision=18142
This commit is contained in:
parent
50ecc78b80
commit
4895e69e30
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue