From 9f1f4593e68a4c2325d024551461436985f3bcbd Mon Sep 17 00:00:00 2001 From: eroen Date: Sat, 8 Mar 2014 23:58:07 +0100 Subject: isso - make ${PN}_LIVE_REPO} work --- www-apps/isso/isso-9999.ebuild | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/www-apps/isso/isso-9999.ebuild b/www-apps/isso/isso-9999.ebuild index e6ccb573..a9dc4b5f 100644 --- a/www-apps/isso/isso-9999.ebuild +++ b/www-apps/isso/isso-9999.ebuild @@ -77,9 +77,10 @@ pkg_setup() { src_fetch() { if [[ ${PV} == *9999* ]]; then git-r3_src_fetch - for EGIT_REPO_URI in "${JS_REPO_URIS[@]}"; do + for EGIT_REPO_URI in "${JS_REPO_URIS[@]}"; do ( + unset ${PN}_LIVE_REPO git-r3_src_fetch - done + ); done else default fi @@ -88,9 +89,10 @@ src_fetch() { src_unpack() { if [[ ${PV} == *9999* ]]; then git-r3_src_unpack - for EGIT_REPO_URI in "${JS_REPO_URIS[@]}"; do + for EGIT_REPO_URI in "${JS_REPO_URIS[@]}"; do ( + unset ${PN}_LIVE_REPO; EGIT_CHECKOUT_DIR=${WORKDIR}/${EGIT_REPO_URI##*/} git-r3_src_unpack - done + ); done mkdir -p "${S}"/isso/js/components/{requirejs-text,almond} || die cp "${WORKDIR}"/text.git/text.js "${S}"/isso/js/components/requirejs-text/ || die cp "${WORKDIR}"/almond.git/almond.js "${S}"/isso/js/components/almond/ || die @@ -137,11 +139,13 @@ python_compile_all() { python_test() { if [[ ${PV} == *9999* ]]; then # doctests fail, require https://github.com/gnublade/doctest-ignore-unicode - nosetests --with-coverage \ - --cover-package=isso --cover-html isso/ specs/ \ + nosetests \ + --with-coverage --cover-package=isso \ + isso/ specs/ \ || die "tests failed" - #nosetests --with-doctest --with-doctest-ignore-unicode --with-coverage \ - # --cover-package=isso --cover-html isso/ specs/ \ + #nosetests --with-doctest --with-doctest-ignore-unicode \ + # --with-coverage --cover-package=isso \ + # isso/ specs/ \ # || die "tests failed" fi } -- cgit v1.2.1