[gentoo-commits] portage r12163 - in main/branches/prefix: bin pym/_emerge

[Fabian Groffen (grobian)]

Author: grobian
Date: 2008-12-05 21:22:55 +0000 (Fri, 05 Dec 2008)
New Revision: 12163

Modified:
   main/branches/prefix/bin/ebuild.sh
   main/branches/prefix/bin/isolated-functions.sh
   main/branches/prefix/bin/misc-functions.sh
   main/branches/prefix/bin/repoman
   main/branches/prefix/pym/_emerge/__init__.py
Log:
   Merged from trunk -r12133:12146

   | 12134   | Source bashrc files as late as possible, giving them the     |
   | zmedico | opportunity to override as much as possible. Thanks to Ned   |
   |         | Ludd <solar@g.o> for the suggestion.                         |
   
   | 12136   | Skip sourcinf of profile.bashrc during the depend phase.     |
   | zmedico |                                                              |
   
   | 12138   | Fix depgraph._dep_check_composite_db._visible() to reject    |
   | zmedico | installed packages that are masked. This is necessary for    |
   |         | correct choices in || deps when we want to ensure that       |
   |         | installed masked packages are not preferred over other       |
   |         | available choices that are not masked. Thanks to Jan         |
   |         | Kundr?\195?\161t <jkt@g.o> for reporting this issue and testing the  |
   |         | patch.                                                       |
   
   | 12140   | When calling `git ls-files -m` to list modified files, use   |
   | zmedico | --with-tree=HEAD so that differences from the most recent    |
   |         | commit are given instead of differences from the index which |
   |         | is used for commit staging purposes. This is required since  |
   |         | otherwise files that have been added via `git add` (such as  |
   |         | echangelog does with the ChangeLog) won't show up in the     |
   |         | list of modified files due to being unmodified relative to   |
   |         | the index. Thanks to Christian Ruppert (idl0r) for           |
   |         | reporting.                                                   |
   
   | 12142   | It's not safe to use the git commit -a option since there    |
   | zmedico | might be some modified files elsewhere in the working tree   |
   |         | that the user doesn't want to commit. Therefore, call git    |
   |         | update-index in order to ensure that the index is updated    |
   |         | with the latest versions of all new and modified files in    |
   |         | the relevant portion of the working tree.                    |
   
   | 12144   | When --keep-going drops packages due to unsatisfied          |
   | zmedico | dependencies, include them in the list of packgaes that      |
   |         | "failed to build or install" that's displayed at the end.    |
   
   | 12146   | Break references between the depgraph and the dropped tasks  |
   | zmedico | inside Scheduler._calc_resume_list(), since the tasks are    |
   |         | now saved for display at the end.                            |


Modified: main/branches/prefix/bin/ebuild.sh
===================================================================
--- main/branches/prefix/bin/ebuild.sh	2008-12-05 01:13:12 UTC (rev 12162)
+++ main/branches/prefix/bin/ebuild.sh	2008-12-05 21:22:55 UTC (rev 12163)
@@ -1502,6 +1502,8 @@
 	esac
 }
 
+PORTAGE_BASHRCS_SOURCED=0
+
 # @FUNCTION: source_all_bashrcs
 # @DESCRIPTION:
 # Source a relevant bashrc files and perform other miscellaneous
@@ -1514,6 +1516,8 @@
 #    function for the current phase.
 #
 source_all_bashrcs() {
+	[[ $PORTAGE_BASHRCS_SOURCED = 1 ]] && return 0
+	PORTAGE_BASHRCS_SOURCED=1
 	local x
 
 	if [[ -n $EBUILD_PHASE && -n ${EAPI/prefix/} ]] ; then
@@ -1525,15 +1529,18 @@
 	fi
 
 	local OCC="${CC}" OCXX="${CXX}"
-	# source the existing profile.bashrc's.
-	save_IFS
-	IFS=$'\n'
-	local path_array=($PROFILE_PATHS)
-	restore_IFS
-	for x in "${path_array[@]}" ; do
-		[ -f "${x}/profile.bashrc" ] && qa_source "${x}/profile.bashrc"
-	done
 
+	if [[ $EBUILD_PHASE != depend ]] ; then
+		# source the existing profile.bashrcs.
+		save_IFS
+		IFS=$'\n'
+		local path_array=($PROFILE_PATHS)
+		restore_IFS
+		for x in "${path_array[@]}" ; do
+			[ -f "$x/profile.bashrc" ] && qa_source "$x/profile.bashrc"
+		done
+	fi
+
 	# We assume if people are changing shopts in their bashrc they do so at their
 	# own peril.  This is the ONLY non-portage bit of code that can change shopts
 	# without a QA violation.
@@ -1853,7 +1860,6 @@
 			;;
 	esac
 
-	source_all_bashrcs
 fi
 
 if ! hasq "$EBUILD_PHASE" clean cleanrm && \
@@ -1902,9 +1908,6 @@
 # PREFIX HACK: ignore prefix, and then respect it again
 [[ -n ${EAPI/prefix/} ]] || EAPI="${EAPI}${EAPI:+ }0"
 
-# enable bashrc support for the clean phase
-hasq "$EBUILD_PHASE" clean cleanrm && source_all_bashrcs
-
 # unset USE_EXPAND variables that contain only the special "*" token
 for x in ${USE_EXPAND} ; do
 	[ "${!x}" == "*" ] && unset ${x}
@@ -1932,6 +1935,7 @@
 fi
 
 ebuild_main() {
+	source_all_bashrcs
 	local f x
 	local export_vars="ASFLAGS CCACHE_DIR CCACHE_SIZE
 		CFLAGS CXXFLAGS LDFLAGS LIBCFLAGS LIBCXXFLAGS"

Modified: main/branches/prefix/bin/isolated-functions.sh
===================================================================
--- main/branches/prefix/bin/isolated-functions.sh	2008-12-05 01:13:12 UTC (rev 12162)
+++ main/branches/prefix/bin/isolated-functions.sh	2008-12-05 21:22:55 UTC (rev 12163)
@@ -516,7 +516,8 @@
 			GOOD HILITE HOME IMAGE \
 			LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
 			NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
-			PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \
+			PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \
+			PORTAGE_BASHRC PORTAGE_BASHRCS_SOURCED \
 			PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \
 			PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
 			PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \

Modified: main/branches/prefix/bin/misc-functions.sh
===================================================================
--- main/branches/prefix/bin/misc-functions.sh	2008-12-05 01:13:12 UTC (rev 12162)
+++ main/branches/prefix/bin/misc-functions.sh	2008-12-05 21:22:55 UTC (rev 12163)
@@ -820,6 +820,7 @@
 }
 
 if [ -n "${MISC_FUNCTIONS_ARGS}" ]; then
+	source_all_bashrcs
 	[ "$PORTAGE_DEBUG" == "1" ] && set -x
 	for x in ${MISC_FUNCTIONS_ARGS}; do
 		${x}

Modified: main/branches/prefix/bin/repoman
===================================================================
--- main/branches/prefix/bin/repoman	2008-12-05 01:13:12 UTC (rev 12162)
+++ main/branches/prefix/bin/repoman	2008-12-05 21:22:55 UTC (rev 12163)
@@ -737,7 +737,7 @@
 	mychanged = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem and elem[:1] in "MR" ]
 	mynew     = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("A") ]
 elif vcs == "git":
-	mychanged = os.popen("git ls-files -m").readlines()
+	mychanged = os.popen("git ls-files -m --with-tree=HEAD").readlines()
 	mychanged = [ "./" +  elem[:-1] for elem in mychanged ]
 	mynew = os.popen("git diff --cached --name-only --diff-filter=A").readlines()
 	strip_levels = repolevel - 1
@@ -1733,7 +1733,7 @@
 			for prop in props if " - " in prop)
 
 	elif vcs == "git":
-		mychanged = os.popen("git ls-files -m").readlines()
+		mychanged = os.popen("git ls-files -m --with-tree=HEAD").readlines()
 		mychanged = [ "./" +  elem[:-1] for elem in mychanged ]
 		mynew = os.popen("git diff --cached --name-only --diff-filter=A").readlines()
 		strip_levels = repolevel - 1
@@ -1764,6 +1764,8 @@
 			mymanifests.add(f)
 		else:
 			myupdates.add(f)
+	if vcs == 'git':
+		myupdates.difference_update(myremoved)
 	myupdates = list(myupdates)
 	mymanifests = list(mymanifests)
 	myheaders = []
@@ -2058,6 +2060,27 @@
 			portage.writemsg("!!! Disabled FEATURES='sign'\n")
 			signed = False
 
+	if vcs == 'git':
+		# It's not safe to use the git commit -a option since there might
+		# be some modified files elsewhere in the working tree that the
+		# user doesn't want to commit. Therefore, call git update-index
+		# in order to ensure that the index is updated with the latest
+		# versions of all new and modified files in the relevant portion
+		# of the working tree.
+		myfiles = mymanifests + myupdates
+		myfiles.sort()
+		update_index_cmd = ["git", "update-index"]
+		update_index_cmd.extend(f.lstrip("./") for f in myfiles)
+		if options.pretend:
+			print "(%s)" % (" ".join(update_index_cmd),)
+		else:
+			retval = spawn(update_index_cmd, env=os.environ)
+			if retval != os.EX_OK:
+				writemsg_level(("!!! Exiting on %s (shell) " + \
+					"error code: %s\n") % (vcs, retval),
+					level=logging.ERROR, noiselevel=-1)
+				sys.exit(retval)
+
 	if vcs == 'git' or manifest_commit_required or signed:
 
 		myfiles = mymanifests[:]

Modified: main/branches/prefix/pym/_emerge/__init__.py
===================================================================
--- main/branches/prefix/pym/_emerge/__init__.py	2008-12-05 01:13:12 UTC (rev 12162)
+++ main/branches/prefix/pym/_emerge/__init__.py	2008-12-05 21:22:55 UTC (rev 12163)
@@ -8253,13 +8253,13 @@
 					arg = None
 				if arg:
 					return False
-				if pkg.installed:
-					try:
-						if not visible(
-							self._depgraph.pkgsettings[pkg.root], pkg):
-							return False
-					except portage.exception.InvalidDependString:
-						pass
+			if pkg.installed:
+				try:
+					if not visible(
+						self._depgraph.pkgsettings[pkg.root], pkg):
+						return False
+				except portage.exception.InvalidDependString:
+					pass
 			return True
 
 		def _dep_expand(self, atom):
@@ -10488,6 +10488,7 @@
 
 		mylist = mydepgraph.altlist()
 		mydepgraph.break_refs(mylist)
+		mydepgraph.break_refs(dropped_tasks)
 		self._mergelist = mylist
 		self._set_digraph(mydepgraph.schedulerGraph())
 
@@ -10509,6 +10510,7 @@
 			# not valid here.
 			settings.pop("T", None)
 			portage.elog.elog_process(pkg.cpv, settings)
+			self._failed_pkgs_all.append(self._failed_pkg(pkg=pkg))
 
 		return True