[gentoo-commits] proj/ufed:master commit in: /

[Sven Eden]

commit:     9e724f7824c11527316f822283242260be12c3d7
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Tue Feb 25 18:15:22 2014 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Tue Feb 25 18:15:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=9e724f78

Portage.pm: /etc/portage/make.profile does no longer need to be a symlink and can be a driectory as well now.

---
 Portage.pm | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/Portage.pm b/Portage.pm
index 5d42860..71cada0 100644
--- a/Portage.pm
+++ b/Portage.pm
@@ -386,22 +386,28 @@ sub _determine_make_conf
 }
 
 
-# read /etc/make.profile and /etc/portage/make.profile and
-# analyze the complete profile tree using the found parent
-# files. Add all found paths to @profiles.
+# read /etc/make.profile and /etc/portage/make.profile and analyze the complete
+# profile tree using the found parent files. Add all found paths to @profiles.
+
 # No parameters accepted.
 sub _determine_profiles
 {
-	my $mp = readlink "${_EPREFIX}/etc/portage/make.profile";
-	defined($mp)
-		or $mp = readlink "${_EPREFIX}/etc/make.profile";
+	my $mp_path = "${_EPREFIX}/etc/portage/make.profile";
+	-e $mp_path or $mp_path = "${_EPREFIX}/etc/make.profile";
+	
+	-e $mp_path
+		or die("make.profile can not be found");
 
-	# make.profile is mandatory and must be a link
+	my $mp = undef;
+	   (-l $mp_path and $mp = readlink $mp_path)
+	or (-d $mp_path and $mp = $mp_path);
+	
+	# make.profile is mandatory and must be a link or directory
 	defined($mp)
-		or die "${_EPREFIX}/etc\{,/portage\}/make.profile is not a symlink\n";
+		or die "$mp_path is neither symlink nor directory\n";
 
-	# Start with the linked path, it is the deepest profile child.
-	@_profiles = _norm_path('/etc', $mp);
+	# Start with the found path, it is the deepest profile child.
+	@_profiles = -l $mp_path ? _norm_path('/etc', $mp) : $mp;
 	for (my $i = -1; $i >= -@_profiles; $i--) {
 		for(_noncomments("${_profiles[$i]}/parent")) {
 			splice(@_profiles, $i, 0, _norm_path(${_profiles[$i]}, $_));