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

[Fabian Groffen (grobian)]

Author: grobian
Date: 2008-02-06 22:26:20 +0000 (Wed, 06 Feb 2008)
New Revision: 9280

Modified:
   main/branches/prefix/bin/ebuild.sh
   main/branches/prefix/bin/misc-functions.sh
   main/branches/prefix/pym/_emerge/__init__.py
   main/branches/prefix/pym/portage/dbapi/vartree.py
   main/branches/prefix/pym/portage/util.py
Log:
   Merged from trunk 9274:9279

   | 9275    | don't record internal providers in NEEDED records as they    |
   | genone  | are pointless for all useful applications in portage and     |
   |         | complicate them instead (e.g. bug #205531)                   |
   
   | 9276    | display errors that occured during package set initalization |
   | genone  |                                                              |
   
   | 9277    | don't try to copy manually removed libraries (bug #208946)   |
   | genone  |                                                              |
   
   | 9278    | Make qa_source and qa_call save the return value and return  |
   | zmedico | it. Thanks to igli for suggesting.                           |
   
   | 9279    | For the useq() IUSE qa check, use [[ $u =~ $PORTAGE_IUSE ]]  |
   | zmedico | instead of egrep since apparently it's compatible in this    |
   |         | case. Thanks to igli for this.                               |


Modified: main/branches/prefix/bin/ebuild.sh
===================================================================
--- main/branches/prefix/bin/ebuild.sh	2008-02-06 08:43:57 UTC (rev 9279)
+++ main/branches/prefix/bin/ebuild.sh	2008-02-06 22:26:20 UTC (rev 9280)
@@ -33,22 +33,26 @@
 
 qa_source() {
 	local shopts=$(shopt) OLDIFS="$IFS"
-	source "$@" || return 1
+	local retval
+	source "$@"
+	retval=$?
 	[[ $shopts != $(shopt) ]] &&
 		eqawarn "QA Notice: Global shell options changed and were not restored while sourcing '$*'"
 	[[ "$IFS" != "$OLDIFS" ]] &&
 		eqawarn "QA Notice: Global IFS changed and was not restored while sourcing '$*'"
-	return 0
+	return $retval
 }
 
 qa_call() {
 	local shopts=$(shopt) OLDIFS="$IFS"
-	"$@" || return 1
+	local retval
+	"$@"
+	retval=$?
 	[[ $shopts != $(shopt) ]] &&
 		eqawarn "QA Notice: Global shell options changed and were not restored while calling '$*'"
 	[[ "$IFS" != "$OLDIFS" ]] &&
 		eqawarn "QA Notice: Global IFS changed and was not restored while calling '$*'"
-	return 0
+	return $retval
 }
 
 # subshell die support
@@ -144,7 +148,7 @@
 		[[ ${EMERGE_FROM} != binary ]] ; then
 		# TODO: Implement PORTAGE_IUSE for binary packages. Currently,
 		# it is only valid for build time phases.
-		echo "${u}" | egrep -q "${PORTAGE_IUSE}" || \
+		[[ $u =~ $PORTAGE_IUSE ]] || \
 			eqawarn "QA Notice: USE Flag '${u}' not" \
 				"in IUSE for ${CATEGORY}/${PF}"
 	fi

Modified: main/branches/prefix/bin/misc-functions.sh
===================================================================
--- main/branches/prefix/bin/misc-functions.sh	2008-02-06 08:43:57 UTC (rev 9279)
+++ main/branches/prefix/bin/misc-functions.sh	2008-02-06 22:26:20 UTC (rev 9280)
@@ -159,8 +159,27 @@
 			sleep 1
 		fi
 
-		# Save NEEDED information
-		scanelf -qyRF '%p %n' "${D}" | sed -e 's:^:/:' > "${PORTAGE_BUILDDIR}"/build-info/NEEDED
+		# Save NEEDED information after removing self-contained providers
+		scanelf -qyRF '%p:%r %n' "${D}" | sed -e 's:^:/:' | { while read l; do
+			obj=${l%%:*}
+			rpath=${l##*:}; rpath=${rpath%% *}
+			needed=${l##* }
+			if [ -z "${rpath}" -o -n "${rpath//*ORIGIN*}" ]; then
+				# object doesn't contain $ORIGIN in its runpath attribute
+				echo "${obj} ${needed}"	>> "${PORTAGE_BUILDDIR}"/build-info/NEEDED
+			else
+				dir=$(dirname ${obj})
+				# replace $ORIGIN with the dirname of the current object for the lookup
+				opath=$(echo :${rpath}: | sed -e "s#.*:\(.*\)\$ORIGIN\(.*\):.*#\1${dir}\2#")
+				sneeded=$(echo ${needed} | tr , ' ')
+				rneeded=""
+				for lib in ${sneeded}; do
+					[ -e "${D}/${dir}/${lib}" ] || rneeded="${rneeded},${lib}"
+				done
+				rneeded=${rneeded:1}
+				[ -n "${rneeded}" ] && echo "${obj} ${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED
+			fi
+		done }
 
 		if [[ ${insecure_rpath} -eq 1 ]] ; then
 			die "Aborting due to serious QA concerns with RUNPATH/RPATH"

Modified: main/branches/prefix/pym/_emerge/__init__.py
===================================================================
--- main/branches/prefix/pym/_emerge/__init__.py	2008-02-06 08:43:57 UTC (rev 9279)
+++ main/branches/prefix/pym/_emerge/__init__.py	2008-02-06 22:26:20 UTC (rev 9280)
@@ -7144,6 +7144,10 @@
 	if myaction in ("clean", "config", "depclean", "info", "prune", "unmerge", None):
 		root_config = trees[settings["ROOT"]]["root_config"]
 		setconfig = root_config.setconfig
+		# display errors that occured while loading the SetConfig instance
+		for e in setconfig.errors:
+			print colorize("BAD", "Error during set creation: %s" % e)
+		
 		sets = setconfig.getSets()
 		# emerge relies on the existance of sets with names "world" and "system"
 		required_sets = ("world", "system")

Modified: main/branches/prefix/pym/portage/dbapi/vartree.py
===================================================================
--- main/branches/prefix/pym/portage/dbapi/vartree.py	2008-02-06 08:43:57 UTC (rev 9279)
+++ main/branches/prefix/pym/portage/dbapi/vartree.py	2008-02-06 22:26:20 UTC (rev 9280)
@@ -1594,11 +1594,16 @@
 		# get the real paths for the libs
 		preserve_paths = [x for x in old_contents if os.path.basename(x) in preserve_libs]
 		del old_contents, old_libs, mylibs, preserve_libs
-			
+
 		# inject files that should be preserved into our image dir
 		import shutil
+		missing_paths = []
 		for x in preserve_paths:
 			print "injecting %s into %s" % (x, srcroot)
+			if not os.path.exists(os.path.join(destroot, x.lstrip(os.sep))):
+				print "%s does not exist so can't be preserved"
+				missing_paths.append(x)
+				continue
 			mydir = os.path.join(srcroot, os.path.dirname(x).lstrip(os.sep))
 			if not os.path.exists(mydir):
 				os.makedirs(mydir)
@@ -1616,6 +1621,10 @@
 				shutil.copy2(os.path.join(destroot, x.lstrip(os.sep)),
 					os.path.join(srcroot, x.lstrip(os.sep)))
 
+		preserve_paths = [x for x in preserve_paths if x not in missing_paths]
+
+		del missing_paths
+
 		# keep track of the libs we preserved
 		self.vartree.dbapi.plib_registry.register(self.mycpv, self.settings["SLOT"], counter, preserve_paths)
 

Modified: main/branches/prefix/pym/portage/util.py
===================================================================
--- main/branches/prefix/pym/portage/util.py	2008-02-06 08:43:57 UTC (rev 9279)
+++ main/branches/prefix/pym/portage/util.py	2008-02-06 22:26:20 UTC (rev 9280)
@@ -1059,3 +1059,21 @@
 			os.path.join(real_dirname, last_pfile)) == newmd5:
 			return old_pfile
 	return new_pfile
+
+def getlibpaths():
+	""" Return a list of paths that are used for library lookups """
+
+	# PREFIX HIJACK: if this function is used (it seems to be just added
+	# nothing more, then let us know, because then we need to fix this...
+	raise "This is not prefix-proof, and certainly not x-platform proof!"
+
+	# the following is based on the information from ld.so(8)
+	rval = os.environ.get("LD_LIBRARY_PATH", "").split(":")
+	rval.extend(grabfile("/etc/ld.so.conf"))
+	rval.append("/usr/lib")
+	rval.append("/lib")
+
+	rval = [normalize_path(x) for x in rval if x != ""]
+	
+	return rval
+	

-- 
gentoo-commits@l.g.o mailing list