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

Collapse All | Expand All

(-)emerge (-2 / +38 lines)
Lines 40-45 Link Here
40
import portage_locks
40
import portage_locks
41
import portage_exception
41
import portage_exception
42
from portage_data import secpass
42
from portage_data import secpass
43
from portage_const import SET_PATH
44
from portage_sets import FileList
43
45
44
if not hasattr(__builtins__, "set"):
46
if not hasattr(__builtins__, "set"):
45
	from sets import Set as set
47
	from sets import Set as set
Lines 194-200 Link Here
194
"--newuse",       "--nocolor",
196
"--newuse",       "--nocolor",
195
"--nodeps",       "--noreplace",
197
"--nodeps",       "--noreplace",
196
"--nospinner",    "--oneshot",
198
"--nospinner",    "--oneshot",
197
"--onlydeps",     "--pretend",
199
"--onlydeps",     "--package-set",
200
"--pretend",
198
"--quiet",        "--resume",
201
"--quiet",        "--resume",
199
"--searchdesc",   "--selective",
202
"--searchdesc",   "--selective",
200
"--skipfirst",    "--skip-first",
203
"--skipfirst",    "--skip-first",
Lines 357-362 Link Here
357
	sub=[]
360
	sub=[]
358
	if "--update" in myopts or myaction in ("system", "world"):
361
	if "--update" in myopts or myaction in ("system", "world"):
359
		add.extend(["selective","empty"])
362
		add.extend(["selective","empty"])
363
	if "--package-set" in myopts:
364
		add.extend(["selective"])
360
	if "--emptytree" in myopts:
365
	if "--emptytree" in myopts:
361
		add.extend(["empty"])
366
		add.extend(["empty"])
362
		sub.extend(["selective"])
367
		sub.extend(["selective"])
Lines 1208-1213 Link Here
1208
				retlist.append(y)
1213
				retlist.append(y)
1209
		return retlist
1214
		return retlist
1210
1215
1216
	def setCreate( self, set_id ):
1217
		""" Checks dependencies on non-system non-world sets """
1218
1219
		packagelist = FileList( SET_PATH + os.path.sep + set_id )
1220
		missing_atoms = []
1221
		for pkg in packagelist.items:
1222
			print pkg
1223
                        try:
1224
                                if not self.select_dep(
1225
                                        self.target_root, pkg, raise_on_missing=True):
1226
                                        print "\n\n!!! Problem resolving dependencies for", mydep
1227
                                        return 0
1228
                        except ValueError:
1229
                                missing_atoms.append(pkg)
1230
                if missing_atoms:
1231
                        print "\n" + colorize("BAD", "!!!") + \
1232
                                " Ebuilds for the following packages are either all"
1233
                        print colorize("BAD", "!!!") + " masked or don't exist:"
1234
                        print " ".join(missing_atoms) + "\n"
1235
1236
                return 1
1237
1211
	def xcreate(self,mode="system"):
1238
	def xcreate(self,mode="system"):
1212
		world_problems = False
1239
		world_problems = False
1213
		if mode=="system":
1240
		if mode=="system":
Lines 3409-3415 Link Here
3409
		myparams = create_depgraph_params(myopts, myaction)
3436
		myparams = create_depgraph_params(myopts, myaction)
3410
		mydepgraph = depgraph(settings, trees,
3437
		mydepgraph = depgraph(settings, trees,
3411
			myopts, myparams, spinner)
3438
			myopts, myparams, spinner)
3412
		if myaction in ["system","world"]:
3439
		if "--package-set" in myopts:
3440
			sets = myfiles
3441
                        if not ("--quiet" in myopts):
3442
				print "Calculating",myaction,"dependencies  ",
3443
				sys.stdout.flush()
3444
				unfulfilled_sets = [p_set for p_set in sets if not mydepgraph.setCreate(p_set)]
3445
				if unfulfilled_sets:
3446
					print "!!! Depgraph creation failed."
3447
					sys.exit(1)					
3448
		elif myaction in ["system","world"]:
3413
			if not ("--quiet" in myopts):
3449
			if not ("--quiet" in myopts):
3414
				print "Calculating",myaction,"dependencies  ",
3450
				print "Calculating",myaction,"dependencies  ",
3415
				sys.stdout.flush()
3451
				sys.stdout.flush()

Return to bug 6411