[kernel] r18042 - dists/trunk/linux-2.6/debian/lib/python/debian_linux
Ben Hutchings
benh at alioth.debian.org
Sat Sep 3 20:55:13 UTC 2011
Author: benh
Date: Sat Sep 3 20:55:12 2011
New Revision: 18042
Log:
Fix debian_linux.utils.read_control to tolerate extra blank lines
Modified:
dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py Sat Sep 3 20:53:59 2011 (r18041)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/utils.py Sat Sep 3 20:55:12 2011 (r18042)
@@ -71,14 +71,16 @@
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 @@
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
More information about the Kernel-svn-changes
mailing list