[gentoo-commits] dev/zorry:master commit in: gobs/pym/

[Magnus Granberg]

commit:     16e795f105f5e2e2d3b6f2ab36b85fa11ecf55af
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 22:17:16 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Jun  3 22:17:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=16e795f1

update dep handling

---
 gobs/pym/build_queru.py |  105 +++++++++++++++++++----------------------------
 gobs/pym/depgraph.py    |   49 ++++++++++++++--------
 2 files changed, 74 insertions(+), 80 deletions(-)

diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py
index 8b33440..46d815c 100644
--- a/gobs/pym/build_queru.py
+++ b/gobs/pym/build_queru.py
@@ -150,68 +150,45 @@ class queruaction(object):
 			root_config = trees[settings["ROOT"]]["root_config"]
 			display_missing_pkg_set(root_config, e.value)
 			build_dict['type_fail'] = "depgraph fail"
-			build_dict['check_fail'] = True
-		use_changes = None
-		if not success:
-			mydepgraph.display_problems()
-			settings, trees, mtimedb = load_emerge_config()
-			myparams = create_depgraph_params(myopts, myaction)
-			try:
-				success, mydepgraph, favorites = backtrack_depgraph(
-				settings, trees, myopts, myparams, myaction, myfiles, spinner)
-			except portage.exception.PackageSetNotFound as e:
-				root_config = trees[settings["ROOT"]]["root_config"]
-				display_missing_pkg_set(root_config, e.value)
-				build_dict['type_fail'] = "depgraph fail"
-				build_dict['check_fail'] = True
-		if not success:
-			mydepgraph.display_problems()
-			build_dict['type_fail'] = "depgraph fail"
-			build_dict['check_fail'] = True
-		
-		"""if mydepgraph._dynamic_config._needed_use_config_changes:
-			use_changes = {}
-			for pkg, needed_use_config_changes in mydepgraph._dynamic_config._needed_use_config_changes.items():
-				new_use, changes = needed_use_config_changes
-				use_changes[pkg.cpv] = changes
-			iteritems_packages = {}
-			for k, v in use_changes.iteritems():
-				k_package = portage.versions.cpv_getkey(k)
-				iteritems_packages[ k_package ] = v
-			logging.info('iteritems_packages %s', iteritems_packages)
-			build_cpv_dict = iteritems_packages
-		if use_changes is not None:
-			for k, v in build_cpv_dict.iteritems():
-				build_use_flags_list = []
-				for x, y in v.iteritems():
-					if y is True:
-						build_use_flags_list.append(x)
-					if y is False:
-						build_use_flags_list.append("-" + x)
-				logging.info("k: %s, build_use_flags_list: %s", k, build_use_flags_list)
-				if not build_use_flags_list == []:
-					build_use_flags = ""
-					for flags in build_use_flags_list:
-						build_use_flags = build_use_flags + flags + ' '
-					filetext = k + ' ' + build_use_flags
-					logging.info('filetext %s', filetext)
-					with open("/etc/portage/package.use/gobs.use", "a") as f:
-						f.write(filetext)
-						f.write('\n')
-			settings, trees, mtimedb = load_emerge_config()
-			myparams = create_depgraph_params(myopts, myaction)
-			try:
-				success, mydepgraph, favorites = backtrack_depgraph(
-					settings, trees, myopts, myparams, myaction, myfiles, spinner)
-			except portage.exception.PackageSetNotFound as e:
-				root_config = trees[settings["ROOT"]]["root_config"]
-				display_missing_pkg_set(root_config, e.value)
-				build_dict['type_fail'] = "depgraph fail"
-				build_dict['check_fail'] = True
-		if not success:
-			mydepgraph.display_problems()
-			build_dict['type_fail'] = "depgraph fail"
-			build_dict['check_fail'] = True"""
+			if not success:
+				if mydepgraph._dynamic_config._needed_p_mask_changes:
+					build_dict['type_fail'] = "Mask packages"
+					build_dict['check_fail'] = True
+					mydepgraph.display_problems()
+					self.log_fail_queru(build_dict, settings)
+					return 1, settings, trees, mtimedb
+					if mydepgraph._dynamic_config._needed_use_config_changes:
+						repeat = True
+						repeat_times = 0
+						while repeat:
+							mydepgraph._display_autounmask()
+							settings, trees, mtimedb = load_emerge_config()
+							myparams = create_depgraph_params(myopts, myaction)
+							try:
+								success, mydepgraph, favorites = backtrack_depgraph(
+								settings, trees, myopts, myparams, myaction, myfiles, spinner)
+							except portage.exception.PackageSetNotFound as e:
+								root_config = trees[settings["ROOT"]]["root_config"]
+								display_missing_pkg_set(root_config, e.value)
+							if not success and mydepgraph._dynamic_config._needed_use_config_changes:
+								print("repaet_times:", repeat_times)
+								if repeat_times is 2:
+									build_dict['type_fail'] = "Need use change"
+									build_dict['check_fail'] = True
+									mydepgraph.display_problems()
+									repeat = False
+									repeat = False
+								else:
+									repeat_times = repeat_times + 1
+							else:
+								repeat = False
+
+				if mydepgraph._dynamic_config._unsolvable_blockers:
+					mydepgraph.display_problems()
+					build_dict['type_fail'] = "Blocking packages"
+					build_dict['check_fail'] = True
+					self.log_fail_queru(build_dict, settings)
+					return 1, settings, trees, mtimedb
 
 		if build_dict['check_fail'] is True:
 				self.log_fail_queru(build_dict, settings)
@@ -693,7 +670,9 @@ class queruaction(object):
 		if not "noclean" in build_dict['post_message']:
 			depclean_fail = main_depclean()
 		try:
-			os.remove("/etc/portage/package.use/gobs.use")
+			os.remove("/etc/portage/package.use/99_autounmask")
+			with open("/etc/portage/package.use/99_autounmask", "a") as f:
+				f.close
 		except:
 			pass
 		if build_fail is False or depclean_fail is False:

diff --git a/gobs/pym/depgraph.py b/gobs/pym/depgraph.py
index 0e8200c..cf5a106 100644
--- a/gobs/pym/depgraph.py
+++ b/gobs/pym/depgraph.py
@@ -3776,7 +3776,7 @@ class depgraph(object):
 				self._dynamic_config._need_restart = True
 		return new_use
 
-	def check_required_use2(required_use, use, iuse_match):
+	def change_required_use(self, pkg):
 		"""
 		Checks if the use flags listed in 'use' satisfy all
 		constraints specified in 'constraints'.
@@ -3792,6 +3792,10 @@ class depgraph(object):
 		@return: Indicates if REQUIRED_USE constraints are satisfied
 		"""
 
+		required_use = pkg.metadata["REQUIRED_USE"]
+		use =self._pkg_use_enabled(pkg)
+		iuse_match = pkg.iuse.is_valid_flag
+
 		def is_active(token):
 			if token.startswith("!"):
 				flag = token[1:]
@@ -3824,14 +3828,15 @@ class depgraph(object):
 		mysplit = required_use.split()
 		level = 0
 		stack = [[]]
-		tree = _RequiredUseBranch()
+		tree = portage.dep._RequiredUseBranch()
 		node = tree
 		need_bracket = False
+		target_use = {}
 
 		for token in mysplit:
 			if token == "(":
 				if not need_bracket:
-					child = _RequiredUseBranch(parent=node)
+					child = portage.dep._RequiredUseBranch(parent=node)
 					node._children.append(child)
 					node = child
 
@@ -3883,7 +3888,7 @@ class depgraph(object):
 									"node is not last child of parent")
 							for child in node._children:
 								node._parent._children.append(child)
-								if isinstance(child, _RequiredUseBranch):
+								if isinstance(child, portage.dep._RequiredUseBranch):
 									child._parent = node._parent
 
 					elif not node._children:
@@ -3898,7 +3903,7 @@ class depgraph(object):
 							raise AssertionError(
 								"node is not last child of parent")
 						node._parent._children.append(node._children[0])
-						if isinstance(node._children[0], _RequiredUseBranch):
+						if isinstance(node._children[0], portage.dep._RequiredUseBranch):
 							node._children[0]._parent = node._parent
 							node = node._children[0]
 							if node._operator is None and \
@@ -3909,7 +3914,7 @@ class depgraph(object):
 										"node is not last child of parent")
 								for child in node._children:
 									node._parent._children.append(child)
-									if isinstance(child, _RequiredUseBranch):
+									if isinstance(child, portage.dep._RequiredUseBranch):
 										child._parent = node._parent
 
 					node = node._parent
@@ -3922,7 +3927,7 @@ class depgraph(object):
 						_("malformed syntax: '%s'") % required_use)
 				need_bracket = True
 				stack[level].append(token)
-				child = _RequiredUseBranch(operator=token, parent=node)
+				child = portage.dep._RequiredUseBranch(operator=token, parent=node)
 				node._children.append(child)
 				node = child
 			else:
@@ -3934,20 +3939,30 @@ class depgraph(object):
 				if token[-1] == "?":
 					need_bracket = True
 					stack[level].append(token)
-					child = _RequiredUseBranch(operator=token, parent=node)
+					child = portage.dep._RequiredUseBranch(operator=token, parent=node)
 					node._children.append(child)
 					node = child
 				else:
 					satisfied = is_active(token)
+					if satisfied is False:
+						new_changes = {}
+						new_changes[token] = True
+						if not pkg.use.mask.intersection(new_changes) or not \
+							pkg.use.force.intersection(new_changes):
+							if token in pkg.use.enabled:
+								target_use[token] = False
+							elif not token in pkg.use.enabled:
+								target_use[token] = True
+
 					stack[level].append(satisfied)
-					node._children.append(_RequiredUseLeaf(token, satisfied))
+					node._children.append(portage.dep._RequiredUseLeaf(token, satisfied))
 
 		if level != 0 or need_bracket:
 			raise InvalidDependString(
 				_("malformed syntax: '%s'") % required_use)
 
 		tree._satisfied = False not in stack[0]
-		return tree
+		return target_use
 
 	def _wrapped_select_pkg_highest_available_imp(self, root, atom, onlydeps=False, autounmask_level=None):
 		root_config = self._frozen_config.roots[root]
@@ -4152,13 +4167,13 @@ class depgraph(object):
 					if pkg.metadata.get("REQUIRED_USE") and eapi_has_required_use(pkg.metadata["EAPI"]):
 						required_use_is_sat = check_required_use(pkg.metadata["REQUIRED_USE"],
 							self._pkg_use_enabled(pkg), pkg.iuse.is_valid_flag)
-						if not required_use_is_sat:
-							if autounmask_level and autounmask_level.allow_use_changes and not pkg.built:
-							# pers the required_use to get the needed use flags
-								required_use = foo()
-							else:
-								pass								
-					
+							if not required_use_is_sat:
+								if autounmask_level and autounmask_level.allow_use_changes \
+									and not pkg.built:
+									target_use = self.change_required_use(pkg)
+									if not target_use is None:
+										use = self._pkg_use_enabled(pkg, target_use)					
+
 					if atom.use:
 						matched_pkgs_ignore_use.append(pkg)
 						if autounmask_level and autounmask_level.allow_use_changes and not pkg.built: