Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 351814
Collapse All | Expand All

(-)a/pym/portage/dbapi/vartree.py (-3 / +10 lines)
Lines 1196-1202 class dblink(object): Link Here
1196
	_contents_re = re.compile(r'^(' + \
1196
	_contents_re = re.compile(r'^(' + \
1197
		r'(?P<dir>(dev|dir|fif) (.+))|' + \
1197
		r'(?P<dir>(dev|dir|fif) (.+))|' + \
1198
		r'(?P<obj>(obj) (.+) (\S+) (\d+))|' + \
1198
		r'(?P<obj>(obj) (.+) (\S+) (\d+))|' + \
1199
		r'(?P<sym>(sym) (.+) -> (.+) (\d+))' + \
1199
		r'(?P<sym>(sym) (.+) -> (.+) ((\d+)|(?P<oldsym>(' + \
1200
		'\(\d+, \d+L, \d+L, \d+, \d+, \d+, \d+L, \d+, (\d+), \d+\)))))' + \
1200
		r')$'
1201
		r')$'
1201
	)
1202
	)
1202
1203
Lines 1379-1384 class dblink(object): Link Here
1379
		obj_index = contents_re.groupindex['obj']
1380
		obj_index = contents_re.groupindex['obj']
1380
		dir_index = contents_re.groupindex['dir']
1381
		dir_index = contents_re.groupindex['dir']
1381
		sym_index = contents_re.groupindex['sym']
1382
		sym_index = contents_re.groupindex['sym']
1383
		# The old symlink format may exist on systems that have packages
1384
		# which were installed many years ago (see bug #351814).
1385
		oldsym_index = contents_re.groupindex['oldsym']
1382
		# CONTENTS files already contain EPREFIX
1386
		# CONTENTS files already contain EPREFIX
1383
		myroot = self.settings['ROOT']
1387
		myroot = self.settings['ROOT']
1384
		if myroot == os.path.sep:
1388
		if myroot == os.path.sep:
Lines 1406-1413 class dblink(object): Link Here
1406
				data = (m.group(base+1),)
1410
				data = (m.group(base+1),)
1407
			elif m.group(sym_index) is not None:
1411
			elif m.group(sym_index) is not None:
1408
				base = sym_index
1412
				base = sym_index
1413
				if m.group(oldsym_index) is None:
1414
					mtime = m.group(base+5)
1415
				else:
1416
					mtime = m.group(base+8)
1409
				#format: type, mtime, dest
1417
				#format: type, mtime, dest
1410
				data = (m.group(base+1), m.group(base+4), m.group(base+3))
1418
				data = (m.group(base+1), mtime, m.group(base+3))
1411
			else:
1419
			else:
1412
				# This won't happen as long the regular expression
1420
				# This won't happen as long the regular expression
1413
				# is written to only match valid entries.
1421
				# is written to only match valid entries.
1414
- 

Return to bug 351814