| 1 |
commit: c3ebc643d5a04cdc34518e6b3b3b37c3238391fa |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 29 11:12:21 2014 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 2 23:05:39 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c3ebc643 |
| 7 |
|
| 8 |
Do not try to source stray directories in bashrc paths |
| 9 |
|
| 10 |
Check whether a particular bashrc path is not a directory before trying |
| 11 |
to source it. Avoids unnecessary 'is a directory' errors. |
| 12 |
|
| 13 |
--- |
| 14 |
bin/ebuild.sh | 2 +- |
| 15 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/bin/ebuild.sh b/bin/ebuild.sh |
| 18 |
index 2ed1335..9c60a41 100755 |
| 19 |
--- a/bin/ebuild.sh |
| 20 |
+++ b/bin/ebuild.sh |
| 21 |
@@ -421,7 +421,7 @@ __try_source() { |
| 22 |
qa=false |
| 23 |
shift |
| 24 |
fi |
| 25 |
- if [[ -r "$1" ]]; then |
| 26 |
+ if [[ -r $1 && -f $1 ]]; then |
| 27 |
local debug_on=false |
| 28 |
if [[ "$PORTAGE_DEBUG" == "1" ]] && [[ "${-/x/}" == "$-" ]]; then |
| 29 |
debug_on=true |
Archives