Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 57212 | Differences between
and this patch

Collapse All | Expand All

(-)portage.py (-1 / +14 lines)
Lines 4157-4162 Link Here
4157
	"""
4157
	"""
4158
	returns '~', '=', '>', '<', '=*', '>=', or '<='
4158
	returns '~', '=', '>', '<', '=*', '>=', or '<='
4159
	"""
4159
	"""
4160
#	operator = None
4160
	if mydep[0] == "~":
4161
	if mydep[0] == "~":
4161
		operator = "~"
4162
		operator = "~"
4162
	elif mydep[0] == "=":
4163
	elif mydep[0] == "=":
Lines 4164-4170 Link Here
4164
			operator = "=*"
4165
			operator = "=*"
4165
		else:
4166
		else:
4166
			operator = "="
4167
			operator = "="
4167
	elif mydep[0] in "><":
4168
	elif mydep[0] in [">", "<"]:
4168
		if len(mydep) > 1 and mydep[1] == "=":
4169
		if len(mydep) > 1 and mydep[1] == "=":
4169
			operator = mydep[0:2]
4170
			operator = mydep[0:2]
4170
		else:
4171
		else:
Lines 4172-4183 Link Here
4172
	else:
4173
	else:
4173
		operator = None
4174
		operator = None
4174
4175
4176
	writemsg("[get_operator] mydep: %s | operator: %s\n" % (mydep, operator) )
4177
4175
	return operator
4178
	return operator
4176
4179
4177
4180
4178
def match_from_list(mydep,candidate_list):
4181
def match_from_list(mydep,candidate_list):
4182
	writemsg("[0] match_from_list starts\n")
4179
	if mydep[0] == "!":
4183
	if mydep[0] == "!":
4184
		writemsg("[1] mydep: %s\n" % mydep)
4180
		mydep = mydep[1:]
4185
		mydep = mydep[1:]
4186
		writemsg("[2] mydep: %s\n" % mydep)
4187
4188
	writemsg("[3] candidate_list: %s\n" % candidate_list)
4181
4189
4182
	mycpv     = dep_getcpv(mydep)
4190
	mycpv     = dep_getcpv(mydep)
4183
	mycpv_cps = catpkgsplit(mycpv) # Can be None if not specific
4191
	mycpv_cps = catpkgsplit(mycpv) # Can be None if not specific
Lines 4192-4202 Link Here
4192
			raise KeyError, "Specific key requires an operator (%s) (try adding an '=')" % (mydep)
4200
			raise KeyError, "Specific key requires an operator (%s) (try adding an '=')" % (mydep)
4193
4201
4194
	if ver and rev:
4202
	if ver and rev:
4203
		writemsg("[4] if ver and ref: mydep: %s, ver: %s, ref: %s\n" % (mydep, ver, rev) )
4195
		operator = get_operator(mydep)
4204
		operator = get_operator(mydep)
4196
		if not operator:
4205
		if not operator:
4197
			writemsg("!!! Invanlid atom: %s\n" % mydep)
4206
			writemsg("!!! Invanlid atom: %s\n" % mydep)
4198
			return []
4207
			return []
4199
	else:
4208
	else:
4209
		writemsg("[5] else: mydep: %s\n" % mydep)
4210
		writemsg("[6] candidate_list: %s\n" % candidate_list)
4200
		operator = None
4211
		operator = None
4201
4212
4202
	mylist = []
4213
	mylist = []
Lines 4256-4261 Link Here
4256
	else:
4267
	else:
4257
		raise KeyError, "Unknown operator: %s" % mydep
4268
		raise KeyError, "Unknown operator: %s" % mydep
4258
	
4269
	
4270
	writemsg("[7] mylist: %s\n" % mylist)
4271
	writemsg("[END] match_from_list ends.\n")
4259
4272
4260
	return mylist
4273
	return mylist
4261
				
4274
				

Return to bug 57212