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

Collapse All | Expand All

(-)depgraph.py (-4 / +18 lines)
Lines 174-179 Link Here
174
					"--getbinpkgonly" in self.myopts)
174
					"--getbinpkgonly" in self.myopts)
175
		del trees
175
		del trees
176
176
177
		#contains the args created by select_files
178
		self._initial_arg_list = []
177
		self.digraph=portage.digraph()
179
		self.digraph=portage.digraph()
178
		# contains all sets added to the graph
180
		# contains all sets added to the graph
179
		self._sets = {}
181
		self._sets = {}
Lines 1065-1071 Link Here
1065
				yield arg, atom
1067
				yield arg, atom
1066
1068
1067
	def select_files(self, myfiles):
1069
	def select_files(self, myfiles):
1068
		"""Given a list of .tbz2s, .ebuilds sets, and deps, create the
1070
		"""Given a list of .tbz2s, .ebuilds sets, and deps, populate
1071
		self._initial_arg_list and call self._resolve to create the 
1069
		appropriate depgraph and return a favorite list."""
1072
		appropriate depgraph and return a favorite list."""
1070
		debug = "--debug" in self.myopts
1073
		debug = "--debug" in self.myopts
1071
		root_config = self.roots[self.target_root]
1074
		root_config = self.roots[self.target_root]
Lines 1323-1336 Link Here
1323
				myfavorites.add(arg.arg)
1326
				myfavorites.add(arg.arg)
1324
		myfavorites = list(myfavorites)
1327
		myfavorites = list(myfavorites)
1325
1328
1326
		pprovideddict = pkgsettings.pprovideddict
1327
		if debug:
1329
		if debug:
1328
			portage.writemsg("\n", noiselevel=-1)
1330
			portage.writemsg("\n", noiselevel=-1)
1329
		# Order needs to be preserved since a feature of --nodeps
1331
		# Order needs to be preserved since a feature of --nodeps
1330
		# is to allow the user to force a specific merge order.
1332
		# is to allow the user to force a specific merge order.
1331
		args.reverse()
1333
		args.reverse()
1332
		while args:
1334
		self._initial_arg_list = args[:]
1333
			arg = args.pop()
1335
	
1336
		return self._resolve(myfavorites)
1337
	
1338
	def _resolve(self, myfavorites):
1339
		"""Given self._initial_arg_list, pull in the root nodes, 
1340
		call self._creategraph to process theier deps and return 
1341
		a favorite list."""
1342
		debug = "--debug" in self.myopts
1343
		onlydeps = "--onlydeps" in self.myopts
1344
		myroot = self.target_root
1345
		pkgsettings = self.pkgsettings[myroot]
1346
		pprovideddict = pkgsettings.pprovideddict
1347
		for arg in self._initial_arg_list:
1334
			for atom in arg.set:
1348
			for atom in arg.set:
1335
				self.spinner.update()
1349
				self.spinner.update()
1336
				dep = Dependency(atom=atom, onlydeps=onlydeps,
1350
				dep = Dependency(atom=atom, onlydeps=onlydeps,

Return to bug 275217