[patch] fix-portage-kernel-localversion.patch

fix-portage-kernel-localversion.patch (text/plain), 1.09 KB, created by Daniel Drake (RETIRED) on 2004-10-31 05:06:32 UTC

Fix new kernel localversion handling:
- need to use absolute path to localversion* files to open them
- handle the possible condition that there is no .config file

Index: portage.py
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/pym/portage.py,v
retrieving revision 1.535
diff -u -b -B -r1.535 portage.py
--- portage.py	31 Oct 2004 04:07:39 -0000	1.535
+++ portage.py	31 Oct 2004 13:03:25 -0000
@@ -821,11 +821,11 @@
 
 	# Append the contents of each to the version string, stripping ALL whitespace
 	for lv in localversions:
-		version += string.join(string.split(string.join(grabfile(lv))), "")
+		version += string.join(string.split(string.join(grabfile(base_dir+"/"+lv))), "")
 
 	# Check the .config for a CONFIG_LOCALVERSION and append that too, also stripping whitespace
 	kernelconfig = getconfig(base_dir+"/.config")
-	if kernelconfig.has_key("CONFIG_LOCALVERSION"):
+	if kernelconfig and kernelconfig.has_key("CONFIG_LOCALVERSION"):
 		version += string.join(string.split(kernelconfig["CONFIG_LOCALVERSION"]), "")
 
 	return (version,None)