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

[Sven Eden]

commit:     e495cb7fd8980b2c3dcef28426187c51a1d9de9e
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Wed Feb 26 09:48:48 2014 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Wed Feb 26 09:48:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=e495cb7f

Portage.pm: Determining the make.profile is now secure of make.profile being a file.

---
 Portage.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Portage.pm b/Portage.pm
index 71cada0..229ebba 100644
--- a/Portage.pm
+++ b/Portage.pm
@@ -400,11 +400,16 @@ sub _determine_profiles
 
 	my $mp = undef;
 	   (-l $mp_path and $mp = readlink $mp_path)
-	or (-d $mp_path and $mp = $mp_path);
+	or (-d $mp_path and $mp = $mp_path)
+		# Be sure it is not a file either:
+	or (-f $mp_path and die(
+		  "\n$mp_path is a file.\n"
+		. " This is an odd setup.\n"
+		. " Please report this incident!\n"));
 	
 	# make.profile is mandatory and must be a link or directory
 	defined($mp)
-		or die "$mp_path is neither symlink nor directory\n";
+		or die("\n$mp_path is neither symlink nor directory\n");
 
 	# Start with the found path, it is the deepest profile child.
 	@_profiles = -l $mp_path ? _norm_path('/etc', $mp) : $mp;