diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-04-30 07:00:23 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-04-30 07:00:23 +0000 |
| commit | be5cf411f236bb33f8a6b46527eb2ac8241366f7 (patch) | |
| tree | da2f6d87c801fdeab7919856cbf2e9994916959c /bin/ebuild.sh | |
| parent | Make RecursiveFileLoader skip hidden directories, and only use a single stat (diff) | |
| download | portage-multirepo-be5cf411f236bb33f8a6b46527eb2ac8241366f7.tar.gz portage-multirepo-be5cf411f236bb33f8a6b46527eb2ac8241366f7.tar.bz2 portage-multirepo-be5cf411f236bb33f8a6b46527eb2ac8241366f7.zip | |
Move the ebuild sourcing code into a new _source_ebuild() function.
(trunk r13299)
svn path=/main/branches/2.1.6/; revision=13470
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index d1e2e8fd..74a848a3 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1802,11 +1802,7 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm depend && \ unset PORTAGE_SANDBOX_ON fi -if ! hasq "$EBUILD_PHASE" clean cleanrm ; then -if [[ $EBUILD_PHASE = depend || ! -f $T/environment || \ - -f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \ - hasq noauto $FEATURES ; then - +_source_ebuild() { # The bashrcs get an opportunity here to set aliases that will be expanded # during sourcing of ebuilds and eclasses. source_all_bashrcs @@ -1845,7 +1841,14 @@ if [[ $EBUILD_PHASE = depend || ! -f $T/environment || \ # This needs to be exported since prepstrip is a separate shell script. [[ -n $QA_PRESTRIPPED ]] && export QA_PRESTRIPPED -fi +} + +if ! hasq "$EBUILD_PHASE" clean cleanrm ; then + if [[ $EBUILD_PHASE = depend || ! -f $T/environment || \ + -f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \ + hasq noauto $FEATURES ; then + _source_ebuild + fi fi # Set default EAPI if necessary, so that most |