From: Sebastian Luther <SebastianLuther@gmx.de>
Date: Sun, 25 Jul 2010 07:12:59 +0000 (+0200)
Subject: FEATURES: Rename lafilefixing -> fixlafiles
X-Git-Tag: v2.2_rc68~463
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ddd60e54e1e74c2257ad53fbeaf53893c9be449;p=portage.git

FEATURES: Rename lafilefixing -> fixlafiles
---

diff --git a/cnf/make.globals b/cnf/make.globals
index bb11327c5..76d0f1bc0 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -44,7 +44,7 @@ FETCHCOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
 RESUMECOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
 
 # Default user options
-FEATURES="assume-digests distlocks fixpackages lafilefixing news parallel-fetch protect-owned
+FEATURES="assume-digests distlocks fixpackages fixlafiles news parallel-fetch protect-owned
           sandbox sfperms strict unknown-features-warn unmerge-logs
           unmerge-orphans userfetch"
 
diff --git a/man/make.conf.5 b/man/make.conf.5
index 161fda337..ea23686c7 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -279,7 +279,7 @@ prior to each build. Due to lack of proper cleanup, this feature can
 interfere with normal emerge operation and therefore it should not be left
 enabled for more than a short period of time.
 .TP
-.B lafilefixing
+.B fixlafiles
 Prevents modifiying .la files to not include other .la files and some other
 fixes (order of flags, duplicated entries, ...)
 .TP
diff --git a/pym/portage/const.py b/pym/portage/const.py
index 5c0901b35..62d3ceaf2 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -87,7 +87,7 @@ SUPPORTED_FEATURES       = frozenset([
                            "assume-digests", "buildpkg", "buildsyspkg", "ccache",
                            "collision-protect", "digest", "distcc", "distlocks",
                            "fakeroot", "fail-clean", "fixpackages", "getbinpkg",
-                           "installsources", "keeptemp", "keepwork", "lafilefixing", "lmirror",
+                           "installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror",
                            "metadata-transfer", "mirror", "multilib-strict", "news",
                            "noauto", "noclean", "nodoc", "noinfo", "noman", "nostrip",
                            "notitles", "parallel-fetch", "parse-eapi-ebuild-head",
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index e9a293628..b9cbc3e0e 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1578,8 +1578,8 @@ def _post_src_install_uid_fix(mysettings, out):
 		unicode_error = False
 		size = 0
 		counted_inodes = set()
-		lafilefixing_announced = False
-		lafilefixing = "lafilefixing" in mysettings.features
+		fixlafiles_announced = False
+		fixlafiles = "fixlafiles" in mysettings.features
 
 		for parent, dirs, files in os.walk(destdir):
 			try:
@@ -1619,7 +1619,7 @@ def _post_src_install_uid_fix(mysettings, out):
 				else:
 					fpath = os.path.join(parent, fname)
 
-				if lafilefixing and \
+				if fixlafiles and \
 					fname.endswith(".la") and os.path.isfile(fpath):
 					f = open(_unicode_encode(fpath,
 						encoding=_encodings['merge'], errors='strict'),
@@ -1630,16 +1630,16 @@ def _post_src_install_uid_fix(mysettings, out):
 						needs_update, new_contents = rewrite_lafile(contents)
 					except portage.exception.InvalidData as e:
 						needs_update = False
-						if not lafilefixing_announced:
-							lafilefixing_announced = True
+						if not fixlafiles_announced:
+							fixlafiles_announced = True
 							writemsg("Fixing .la files\n", fd=out)
 						msg = "   %s is not a valid libtool archive, skipping\n" % fpath[len(destdir):]
 						qa_msg = "QA Notice: invalid .la file found: %s, %s" % (fpath[len(destdir):], e)
 						writemsg(msg, fd=out)
 						eqawarn(qa_msg, key=mysettings.mycpv, out=out)
 					if needs_update:
-						if not lafilefixing_announced:
-							lafilefixing_announced = True
+						if not fixlafiles_announced:
+							fixlafiles_announced = True
 							writemsg("Fixing .la files\n", fd=out)
 						writemsg("   %s\n" % fpath[len(destdir):], fd=out)
 						f = open(_unicode_encode(fpath,