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

["Magnus Granberg" <zorry@gentoo.org>]

commit:     541e65103ae30fbf83a7d49ff6a05205a069e9e2
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 14:38:48 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 14:38:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=541e6510

fix for depgraph

---
 gobs/pym/build_queru.py |   98 +++++++++++++++++++++++-----------------------
 1 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py
index 068c879..3d2ef11 100644
--- a/gobs/pym/build_queru.py
+++ b/gobs/pym/build_queru.py
@@ -150,57 +150,57 @@ class queruaction(object):
 			root_config = trees[settings["ROOT"]]["root_config"]
 			display_missing_pkg_set(root_config, e.value)
 			build_dict['type_fail'] = "depgraph fail"
-			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:
+		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 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 mydepgraph._dynamic_config._slot_collision_info:
-					mydepgraph.display_problems()
-					build_dict['type_fail'] = "Slot blocking"
-					build_dict['check_fail'] = True
-					self.log_fail_queru(build_dict, settings)
-					return 1, settings, trees, mtimedb
-
-				if not success:
-					build_dict['type_fail'] = "Dep calc fail"
-					build_dict['check_fail'] = True
-					mydepgraph.display_problems()
+			if mydepgraph._dynamic_config._slot_collision_info:
+				mydepgraph.display_problems()
+				build_dict['type_fail'] = "Slot blocking"
+				build_dict['check_fail'] = True
+				self.log_fail_queru(build_dict, settings)
+				return 1, settings, trees, mtimedb
+
+			if not success:
+				build_dict['type_fail'] = "Dep calc fail"
+				build_dict['check_fail'] = True
+				mydepgraph.display_problems()
 
 		if build_dict['check_fail'] is True:
 				self.log_fail_queru(build_dict, settings)