def scan_contents(self):
'''
Yields the contents of the package. Only regular files are yielded and
- the path names are normalized after converting them from either utf-8 or
- iso8859-1 encoding.
+ the path names are normalized after converting them from either utf-8
+ or iso8859-1 encoding. It yields the string ' <EMPTY PACKAGE>' if the
+ package does not contain any regular file.
'''
fullpath = self.poolfile.fullpath
dpkg = Popen(['dpkg-deb', '--fsys-tarfile', fullpath], stdout = PIPE)
tar = TarFile.open(fileobj = dpkg.stdout, mode = 'r|')
+ anything_yielded = False
for member in tar.getmembers():
if member.isfile():
+ name = normpath(member.name)
+ # enforce proper utf-8 encoding
try:
- name = member.name.decode('utf-8')
+ name.decode('utf-8')
except UnicodeDecodeError:
- name = member.name.decode('iso8859-1')
- yield normpath(name)
+ name = name.decode('iso8859-1').encode('utf-8')
+ yield name
+ anything_yielded = True
+ if not anything_yielded:
+ yield ' <EMPTY PACKAGE>'
tar.close()
dpkg.stdout.close()
dpkg.wait()
engine_args['pool_size'] = int(cnf['DB::PoolSize'])
if cnf.has_key('DB::MaxOverflow'):
engine_args['max_overflow'] = int(cnf['DB::MaxOverflow'])
- if sa_major_version >= 0.6 and cnf.has_key('DB::Unicode') and \
+ if sa_major_version == '0.6' and cnf.has_key('DB::Unicode') and \
cnf['DB::Unicode'] == 'false':
engine_args['use_native_unicode'] = False