[gentoo-commits] portage r15453 - in main/trunk/pym/portage: . package/ebuild util

[Zac Medico (zmedico)]

Author: zmedico
Date: 2010-02-25 07:33:32 +0000 (Thu, 25 Feb 2010)
New Revision: 15453

Added:
   main/trunk/pym/portage/util/ExtractKernelVersion.py
Modified:
   main/trunk/pym/portage/__init__.py
   main/trunk/pym/portage/package/ebuild/doebuild.py
Log:
Move ExtractKernelVersion portage.util.ExtractKernelVersion.


Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py	2010-02-25 07:17:51 UTC (rev 15452)
+++ main/trunk/pym/portage/__init__.py	2010-02-25 07:33:32 UTC (rev 15453)
@@ -121,6 +121,7 @@
 			'writemsg_stdout,write_atomic',
 		'portage.util.digraph:digraph',
 		'portage.util.env_update:env_update',
+		'portage.util.ExtractKernelVersion:ExtractKernelVersion',
 		'portage.util.listdir:cacheddir,listdir',
 		'portage.versions',
 		'portage.versions:best,catpkgsplit,catsplit,cpv_getkey,' + \
@@ -533,73 +534,6 @@
 		mylink=mydir+"/"+mylink
 	return os.path.normpath(mylink)
 
-def ExtractKernelVersion(base_dir):
-	"""
-	Try to figure out what kernel version we are running
-	@param base_dir: Path to sources (usually /usr/src/linux)
-	@type base_dir: string
-	@rtype: tuple( version[string], error[string])
-	@returns:
-	1. tuple( version[string], error[string])
-	Either version or error is populated (but never both)
-
-	"""
-	lines = []
-	pathname = os.path.join(base_dir, 'Makefile')
-	try:
-		f = codecs.open(_unicode_encode(pathname,
-			encoding=_encodings['fs'], errors='strict'), mode='r',
-			encoding=_encodings['content'], errors='replace')
-	except OSError as details:
-		return (None, str(details))
-	except IOError as details:
-		return (None, str(details))
-
-	try:
-		for i in range(4):
-			lines.append(f.readline())
-	except OSError as details:
-		return (None, str(details))
-	except IOError as details:
-		return (None, str(details))
-
-	lines = [l.strip() for l in lines]
-
-	version = ''
-
-	#XXX: The following code relies on the ordering of vars within the Makefile
-	for line in lines:
-		# split on the '=' then remove annoying whitespace
-		items = line.split("=")
-		items = [i.strip() for i in items]
-		if items[0] == 'VERSION' or \
-			items[0] == 'PATCHLEVEL':
-			version += items[1]
-			version += "."
-		elif items[0] == 'SUBLEVEL':
-			version += items[1]
-		elif items[0] == 'EXTRAVERSION' and \
-			items[-1] != items[0]:
-			version += items[1]
-
-	# Grab a list of files named localversion* and sort them
-	localversions = os.listdir(base_dir)
-	for x in range(len(localversions)-1,-1,-1):
-		if localversions[x][:12] != "localversion":
-			del localversions[x]
-	localversions.sort()
-
-	# Append the contents of each to the version string, stripping ALL whitespace
-	for lv in localversions:
-		version += "".join( " ".join( grabfile( base_dir+ "/" + lv ) ).split() )
-
-	# Check the .config for a CONFIG_LOCALVERSION and append that too, also stripping whitespace
-	kernelconfig = getconfig(base_dir+"/.config")
-	if kernelconfig and "CONFIG_LOCALVERSION" in kernelconfig:
-		version += "".join(kernelconfig["CONFIG_LOCALVERSION"].split())
-
-	return (version,None)
-
 _doebuild_manifest_exempt_depend = 0
 
 def digestgen(myarchives=None, mysettings=None,

Modified: main/trunk/pym/portage/package/ebuild/doebuild.py
===================================================================
--- main/trunk/pym/portage/package/ebuild/doebuild.py	2010-02-25 07:17:51 UTC (rev 15452)
+++ main/trunk/pym/portage/package/ebuild/doebuild.py	2010-02-25 07:33:32 UTC (rev 15453)
@@ -21,23 +21,34 @@
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
 	'portage.package.ebuild.config:check_config_instance',
+	'portage.util.ExtractKernelVersion:ExtractKernelVersion'
 )
 
-from portage import auxdbkeys, bsd_chflags, dep_check, digestcheck, digestgen, eapi_is_supported, ExtractKernelVersion, merge, os, selinux, StringIO, unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, _shell_quote, _split_ebuild_name_glep55, _unicode_decode, _unicode_encode
-from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_BINARY, INVALID_ENV_FILE, MISC_SH_BINARY
-from portage.data import portage_gid, portage_uid, secpass, uid, userpriv_groups
+from portage import auxdbkeys, bsd_chflags, dep_check, digestcheck, \
+	digestgen, eapi_is_supported, merge, os, selinux, StringIO, \
+	unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \
+	_shell_quote, _split_ebuild_name_glep55, _unicode_decode, _unicode_encode
+from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_BINARY, \
+	INVALID_ENV_FILE, MISC_SH_BINARY
+from portage.data import portage_gid, portage_uid, secpass, \
+	uid, userpriv_groups
 from portage.dbapi.virtual import fakedbapi
-from portage.dep import Atom, paren_enclose, paren_normalize, paren_reduce, use_reduce
+from portage.dep import Atom, paren_enclose, paren_normalize, \
+	paren_reduce, use_reduce
 from portage.elog import elog_process
 from portage.elog.messages import eerror, eqawarn
-from portage.exception import DigestException, FileNotFound, IncorrectParameter, InvalidAtom, InvalidDependString, PermissionDenied, UnsupportedAPIException
+from portage.exception import DigestException, FileNotFound, \
+	IncorrectParameter, InvalidAtom, InvalidDependString, PermissionDenied, \
+	UnsupportedAPIException
 from portage.localization import _
 from portage.manifest import Manifest
 from portage.output import style_to_ansi_code
 from portage.package.ebuild.fetch import fetch
 from portage.package.ebuild.prepare_build_dirs import prepare_build_dirs
 from portage.package.ebuild._pty import _create_pty_or_pipe
-from portage.util import apply_recursive_permissions, apply_secpass_permissions, noiselimit, normalize_path, writemsg, writemsg_stdout, write_atomic
+from portage.util import apply_recursive_permissions, \
+	apply_secpass_permissions, noiselimit, normalize_path, \
+	writemsg, writemsg_stdout, write_atomic
 from portage.versions import _pkgsplit
 
 def doebuild_environment(myebuild, mydo, myroot, mysettings,

Added: main/trunk/pym/portage/util/ExtractKernelVersion.py
===================================================================
--- main/trunk/pym/portage/util/ExtractKernelVersion.py	                        (rev 0)
+++ main/trunk/pym/portage/util/ExtractKernelVersion.py	2010-02-25 07:33:32 UTC (rev 15453)
@@ -0,0 +1,77 @@
+# Copyright 2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+__all__ = ['ExtractKernelVersion']
+
+import codecs
+
+from portage import os, _encodings, _unicode_encode
+from portage.util import getconfig, grabfile
+
+def ExtractKernelVersion(base_dir):
+	"""
+	Try to figure out what kernel version we are running
+	@param base_dir: Path to sources (usually /usr/src/linux)
+	@type base_dir: string
+	@rtype: tuple( version[string], error[string])
+	@returns:
+	1. tuple( version[string], error[string])
+	Either version or error is populated (but never both)
+
+	"""
+	lines = []
+	pathname = os.path.join(base_dir, 'Makefile')
+	try:
+		f = codecs.open(_unicode_encode(pathname,
+			encoding=_encodings['fs'], errors='strict'), mode='r',
+			encoding=_encodings['content'], errors='replace')
+	except OSError as details:
+		return (None, str(details))
+	except IOError as details:
+		return (None, str(details))
+
+	try:
+		for i in range(4):
+			lines.append(f.readline())
+	except OSError as details:
+		return (None, str(details))
+	except IOError as details:
+		return (None, str(details))
+
+	lines = [l.strip() for l in lines]
+
+	version = ''
+
+	#XXX: The following code relies on the ordering of vars within the Makefile
+	for line in lines:
+		# split on the '=' then remove annoying whitespace
+		items = line.split("=")
+		items = [i.strip() for i in items]
+		if items[0] == 'VERSION' or \
+			items[0] == 'PATCHLEVEL':
+			version += items[1]
+			version += "."
+		elif items[0] == 'SUBLEVEL':
+			version += items[1]
+		elif items[0] == 'EXTRAVERSION' and \
+			items[-1] != items[0]:
+			version += items[1]
+
+	# Grab a list of files named localversion* and sort them
+	localversions = os.listdir(base_dir)
+	for x in range(len(localversions)-1,-1,-1):
+		if localversions[x][:12] != "localversion":
+			del localversions[x]
+	localversions.sort()
+
+	# Append the contents of each to the version string, stripping ALL whitespace
+	for lv in localversions:
+		version += "".join( " ".join( grabfile( base_dir+ "/" + lv ) ).split() )
+
+	# Check the .config for a CONFIG_LOCALVERSION and append that too, also stripping whitespace
+	kernelconfig = getconfig(base_dir+"/.config")
+	if kernelconfig and "CONFIG_LOCALVERSION" in kernelconfig:
+		version += "".join(kernelconfig["CONFIG_LOCALVERSION"].split())
+
+	return (version,None)


Property changes on: main/trunk/pym/portage/util/ExtractKernelVersion.py
___________________________________________________________________
Added: svn:keywords
   + Id