[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/, bin/, pym/_emerge/

[Zac Medico]

commit:     f86b547f1dbedb504de26e69ad66338258411a8f
Author:     David James <davidjames <AT> google <DOT> com>
AuthorDate: Thu Apr 28 21:22:15 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 21:22:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f86b547f

Move preinst/postinst_bsdflags from bash to py

Moving these commands from shell to Python helps avoid an unnecessary
call to misc-functions.sh for the postinst_bsdflags. This improves
performance.

BUG=none
TEST=Run emerge-x86-generic -eg --jobs=16 libchrome

Change-Id: I0c2af50b4d2f7644cabac84fde7fe4d682010c69

Review URL: http://codereview.chromium.org/6676107

---
 bin/misc-functions.sh                  |   16 -------------
 pym/_emerge/EbuildPhase.py             |    7 +++++-
 pym/portage/package/ebuild/doebuild.py |   37 +++++++++++++++++++------------
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 4c5b61a..af0cc27 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -723,22 +723,6 @@ install_mask() {
 	set -${shopts}
 }
 
-preinst_bsdflags() {
-	hasq chflags $FEATURES || return
-	# Save all the file flags for restoration after installation.
-	mtree -c -p "${D}" -k flags > "${T}/bsdflags.mtree"
-	# Remove all the file flags so that the merge phase can do anything
-	# necessary.
-	chflags -R noschg,nouchg,nosappnd,nouappnd "${D}"
-	chflags -R nosunlnk,nouunlnk "${D}" 2>/dev/null
-}
-
-postinst_bsdflags() {
-	hasq chflags $FEATURES || return
-	# Restore all the file flags that were saved before installation.
-	mtree -e -p "${ROOT}" -U -k flags < "${T}/bsdflags.mtree" &> /dev/null
-}
-
 preinst_mask() {
 	if [ -z "${D}" ]; then
 		 eerror "${FUNCNAME}: D is unset"

diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index c9d1747..07fb69c 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -17,7 +17,8 @@ portage.proxy.lazyimport.lazyimport(globals(),
 	'portage.package.ebuild.doebuild:_check_build_log,' + \
 		'_post_phase_cmds,_post_phase_userpriv_perms,' + \
 		'_post_src_install_chost_fix,' + \
-		'_post_src_install_uid_fix'
+		'_post_src_install_uid_fix,_postinst_bsdflags,' + \
+		'_preinst_bsdflags'
 )
 from portage import os
 from portage import StringIO
@@ -178,6 +179,10 @@ class EbuildPhase(CompositeTask):
 				encoding=_encodings['content'], errors='replace')
 			if msg:
 				self.scheduler.output(msg, log_path=logfile)
+		elif self.phase == "preinst":
+			_preinst_bsdflags(settings)
+		elif self.phase == "postinst":
+			_postinst_bsdflags(settings)
 
 		post_phase_cmds = _post_phase_cmds.get(self.phase)
 		if post_phase_cmds is not None:

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index f353166..2a40791 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1233,14 +1233,10 @@ _post_phase_cmds = {
 		"install_symlink_html_docs"],
 
 	"preinst" : [
-		"preinst_bsdflags",
 		"preinst_sfperms",
 		"preinst_selinux_labels",
 		"preinst_suid_scan",
-		"preinst_mask"],
-
-	"postinst" : [
-		"postinst_bsdflags"]
+		"preinst_mask"]
 }
 
 def _post_phase_userpriv_perms(mysettings):
@@ -1392,6 +1388,27 @@ _vdb_use_conditional_keys = ('DEPEND', 'LICENSE', 'PDEPEND',
 	'PROPERTIES', 'PROVIDE', 'RDEPEND', 'RESTRICT',)
 _vdb_use_conditional_atoms = frozenset(['DEPEND', 'PDEPEND', 'RDEPEND'])
 
+def _preinst_bsdflags(mysettings):
+	if bsd_chflags:
+		# Save all the file flags for restoration later.
+		os.system("mtree -c -p %s -k flags > %s" % \
+			(_shell_quote(mysettings["D"]),
+			_shell_quote(os.path.join(mysettings["T"], "bsdflags.mtree"))))
+
+		# Remove all the file flags to avoid EPERM errors.
+		os.system("chflags -R noschg,nouchg,nosappnd,nouappnd %s" % \
+			(_shell_quote(mysettings["D"]),))
+		os.system("chflags -R nosunlnk,nouunlnk %s 2>/dev/null" % \
+			(_shell_quote(mysettings["D"]),))
+
+
+def _postinst_bsdflags(mysettings):
+	if bsd_chflags:
+		# Restore all of the flags saved above.
+		os.system("mtree -e -p %s -U -k flags < %s > /dev/null" % \
+			(_shell_quote(mysettings["D"]),
+			_shell_quote(os.path.join(mysettings["T"], "bsdflags.mtree"))))
+
 def _post_src_install_uid_fix(mysettings, out):
 	"""
 	Files in $D with user and group bits that match the "portage"
@@ -1406,15 +1423,7 @@ def _post_src_install_uid_fix(mysettings, out):
 	inst_uid = int(mysettings["PORTAGE_INST_UID"])
 	inst_gid = int(mysettings["PORTAGE_INST_GID"])
 
-	if bsd_chflags:
-		# Temporarily remove all of the flags in order to avoid EPERM errors.
-		os.system("mtree -c -p %s -k flags > %s" % \
-			(_shell_quote(mysettings["D"]),
-			_shell_quote(os.path.join(mysettings["T"], "bsdflags.mtree"))))
-		os.system("chflags -R noschg,nouchg,nosappnd,nouappnd %s" % \
-			(_shell_quote(mysettings["D"]),))
-		os.system("chflags -R nosunlnk,nouunlnk %s 2>/dev/null" % \
-			(_shell_quote(mysettings["D"]),))
+	_preinst_bsdflags(mysettings)
 
 	destdir = mysettings["D"]
 	unicode_errors = []