[patch] catalyst-2.0_rc39 fix for build.py with portage-2.1_pre*

catalyst-2.0_rc39-build_py-portage21.patch (text/plain), 1.25 KB, created by Rafael on 2006-02-21 00:50:48 UTC

diff -r -u -N catalyst.old/build.py catalyst.new/build.py
--- catalyst.old/build.py	2006-02-17 15:51:30.000000000 +0100
+++ catalyst.new/build.py	2006-02-21 09:04:57.327538312 +0100
@@ -3,16 +3,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/build.py,v 1.3 2005/07/05 21:53:41 wolf31o2 Exp $
 
-import portage,sys
+import os,portage,sys
 
 # this loads files from the profiles ...
 # wrap it here to take care of the different
 # ways portage handles stacked profiles
+# last case is for portage-2.1_pre*
 def scan_profile(file):
 	if "grab_stacked" in dir(portage):
 		return portage.grab_stacked(file, portage.settings.profiles, portage.grabfile, incremental_lines=1);
 	else:
-		return portage.stack_lists( portage.grab_multiple(file, portage.settings.profiles, portage.grabfile), incremental=1);
+		if "grab_multiple" in dir(portage):
+			return portage.stack_lists( portage.grab_multiple(file, portage.settings.profiles, portage.grabfile), incremental=1);
+		else:	
+			return portage.stack_lists( [portage.grabfile_package(os.path.join(x, file)) for x in portage.settings.profiles], incremental=1);
 
 # loaded the stacked packages / packages.build files
 pkgs = scan_profile("packages")