From: <lu...@us...> - 2007-09-29 06:52:33
|
Revision: 7351 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7351&view=rev Author: luke-jr Date: 2007-09-28 23:52:34 -0700 (Fri, 28 Sep 2007) Log Message: ----------- s/true/false ... if no existing install Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass Modified: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 06:48:22 UTC (rev 7350) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 06:52:34 UTC (rev 7351) @@ -38,13 +38,15 @@ return 1 # always false [ "${LIVE_UPDATES}" = 'manual' ] && return 1 # always false + + local ENVFILE="${ROOT}/var/db/pkg/${CATEGORY}/${P}/environment.bz2" + [ -r "${ENVFILE}" ] || return 1 # false if no existing install + [ "${LIVE_UPDATES}" = 'always' ] && __live_why='-Always' && return 0 # always true # Then/Now logic - local ENVFILE="${ROOT}/var/db/pkg/${CATEGORY}/${P}/environment.bz2" - [ -r "${ENVFILE}" ] || return 0 # true if no earlier install local Then Now case "${LIVE_UPDATES}" in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-29 08:22:46
|
Revision: 7352 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7352&view=rev Author: luke-jr Date: 2007-09-29 01:22:46 -0700 (Sat, 29 Sep 2007) Log Message: ----------- userpriv breaks the cache disabling stuff Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass Modified: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 06:52:34 UTC (rev 7351) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:22:46 UTC (rev 7352) @@ -1,5 +1,7 @@ EXPORT_FUNCTIONS pkg_postinst +RESTRICT="${RESTRICT} userpriv" + live_svn_currentrev() { # NOTE: we use $(which sed) to pass QA checks LC_ALL=C svn info "${1}" | This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-29 08:26:48
|
Revision: 7353 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7353&view=rev Author: luke-jr Date: 2007-09-29 01:26:52 -0700 (Sat, 29 Sep 2007) Log Message: ----------- actually, that didnt help :/ Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass Modified: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:22:46 UTC (rev 7352) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:26:52 UTC (rev 7353) @@ -1,7 +1,5 @@ EXPORT_FUNCTIONS pkg_postinst -RESTRICT="${RESTRICT} userpriv" - live_svn_currentrev() { # NOTE: we use $(which sed) to pass QA checks LC_ALL=C svn info "${1}" | @@ -94,7 +92,7 @@ live() { # Activate Live if appropriate -[ "$EBUILD_PHASE" == 'depend' ] && + if [ "$EBUILD_PHASE" == 'depend' ]; then live_want_update && IUSE="$IUSE z~Live${__live_why}" # 'z~' to make sure it's listed last :) @@ -102,6 +100,7 @@ # Disable caching to get LIVE_UPDATES changes effective addwrite "${BASH_SOURCE[0]}" touch "${BASH_SOURCE[0]}" + fi true } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-29 08:40:09
|
Revision: 7354 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7354&view=rev Author: luke-jr Date: 2007-09-29 01:40:12 -0700 (Sat, 29 Sep 2007) Log Message: ----------- looks like all we can do is accept userpriv as a feature breaker Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass Modified: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:26:52 UTC (rev 7353) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:40:12 UTC (rev 7354) @@ -28,7 +28,7 @@ if has ManualSCM ${FEATURES}; then LIVE_UPDATES=manual elif [ "${SUBVERSION_REVBUMP}" = 'no' ]; then - LIVE_UPDATES=manual + LIVE_UPDATES=never else LIVE_UPDATES=revision fi @@ -36,6 +36,14 @@ [ "${LIVE_UPDATES}" = 'never' ] && return 1 # always false + + # Disable caching to get LIVE_UPDATES changes effective + addwrite "${BASH_SOURCE[0]}" + if ! touch "${BASH_SOURCE[0]}"; then + __live_why=-userpriv + return 0 # always true, because userpriv prevents conditionals + fi + [ "${LIVE_UPDATES}" = 'manual' ] && return 1 # always false @@ -96,10 +104,6 @@ live_want_update && IUSE="$IUSE z~Live${__live_why}" # 'z~' to make sure it's listed last :) - - # Disable caching to get LIVE_UPDATES changes effective - addwrite "${BASH_SOURCE[0]}" - touch "${BASH_SOURCE[0]}" fi true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-29 08:45:28
|
Revision: 7355 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7355&view=rev Author: luke-jr Date: 2007-09-29 01:45:32 -0700 (Sat, 29 Sep 2007) Log Message: ----------- quieter userpriv handling, and notice on its restriction Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass Modified: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:40:12 UTC (rev 7354) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:45:32 UTC (rev 7355) @@ -39,7 +39,7 @@ # Disable caching to get LIVE_UPDATES changes effective addwrite "${BASH_SOURCE[0]}" - if ! touch "${BASH_SOURCE[0]}"; then + if ! touch "${BASH_SOURCE[0]}" 2>/dev/null; then __live_why=-userpriv return 0 # always true, because userpriv prevents conditionals fi @@ -129,8 +129,9 @@ ewarn ' date%Y%m - Update once a month' ewarn ' (other variants also possible)' ewarn ' always - Always treat as an update' - ewarn 'To make your change take effect immediately, you need to run:' - ewarn ' emerge --metadata' ewarn + ewarn 'If you use FEATURES=userpriv, then packages will always be' + ewarn ' updated unless you set LIVE_UPDATES=never and remerge.' + ewarn ebeep 5 } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-29 09:01:02
|
Revision: 7356 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7356&view=rev Author: luke-jr Date: 2007-09-29 02:00:17 -0700 (Sat, 29 Sep 2007) Log Message: ----------- a bit more just to get some updating Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass Modified: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 08:45:32 UTC (rev 7355) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-09-29 09:00:17 UTC (rev 7356) @@ -1,4 +1,4 @@ -EXPORT_FUNCTIONS pkg_postinst +EXPORT_FUNCTIONS pkg_postinst pkg_preinst src_unpack live_svn_currentrev() { # NOTE: we use $(which sed) to pass QA checks @@ -110,6 +110,7 @@ } live_pkg_postinst() { + touch "${BASH_SOURCE[0]}" 2>/dev/null || true [ "$SUBVERSION_REVBUMP" == "no" ] && return has ManualSCM ${FEATURES} && return [ "${LIVE_UPDATES}" = 'never' ] && return @@ -135,3 +136,7 @@ ewarn ebeep 5 } + +live_pkg_preinst() { + touch "${BASH_SOURCE[0]}" 2>/dev/null || true +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-10-11 18:34:55
|
Revision: 7363 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7363&view=rev Author: luke-jr Date: 2007-10-11 11:34:53 -0700 (Thu, 11 Oct 2007) Log Message: ----------- handle lack of VDB somewhat Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass Modified: armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass =================================================================== --- armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-10-08 14:31:05 UTC (rev 7362) +++ armagetronad/trunk/build/gentoo/overlay/eclass/live.eclass 2007-10-11 18:34:53 UTC (rev 7363) @@ -47,9 +47,13 @@ [ "${LIVE_UPDATES}" = 'manual' ] && return 1 # always false - local ENVFILE="${ROOT}/var/db/pkg/${CATEGORY}/${P}/environment.bz2" - [ -r "${ENVFILE}" ] || return 1 # false if no existing install + local VDBROOT="${ROOT}/var/db/pkg" + [ -d "${VDBROOT}" ] || return 0 # always update if no VDB + local ENVFILE="${VDBROOT}/${CATEGORY}/${P}/environment.bz2" + [ -a "${ENVFILE}" ] || return 1 # false if no existing install + [ -r "${ENVFILE}" ] || return 0 # always update if can't read VDB + [ "${LIVE_UPDATES}" = 'always' ] && __live_why='-Always' && return 0 # always true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |