diff options
| author |   Nicholas Jones <carpaski@gentoo.org> | 2003-04-29 15:57:29 +0000 |
|---|---|---|
| committer | Nicholas Jones <carpaski@gentoo.org> | 2003-04-29 15:57:29 +0000 |
| commit | 57cf36f14cd9cff8e0cf094a828087bee5f82ffc (patch) | |
| tree | a9865cc63d9c3f7c65d848a0cbf7f7a505081d07 /sys-apps | |
| parent | old (diff) | |
| download | gentoo-2-57cf36f14cd9cff8e0cf094a828087bee5f82ffc.tar.gz gentoo-2-57cf36f14cd9cff8e0cf094a828087bee5f82ffc.tar.bz2 gentoo-2-57cf36f14cd9cff8e0cf094a828087bee5f82ffc.zip | |
Fix for the access violation when updating from 2.0.44
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.0.47-r10.ebuild | 20 |
2 files changed, 5 insertions, 17 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index faf7385ebc4a..f907f2c2ed2c 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,5 +1,5 @@ MD5 540fc101dc7c7355eab599509728d5bb portage-2.0.48_pre3.ebuild 8902 -MD5 a90435c5b02c6561a04aab8b2755fd1b portage-2.0.47-r10.ebuild 8844 +MD5 b6056a07ab123083ddd1b7a6c0460e93 portage-2.0.47-r10.ebuild 8486 MD5 30286e3aa7a1e245e2a6ddaa35a090c5 ChangeLog 409 MD5 b9ab4501a7efbcb9b7d4c8fd170ca51e portage-2.0.48_pre4.ebuild 8902 MD5 b3358b0a30041b08b8c1e3c6813d5002 files/digest-portage-2.0.48_pre3 72 diff --git a/sys-apps/portage/portage-2.0.47-r10.ebuild b/sys-apps/portage/portage-2.0.47-r10.ebuild index 40b925b102e7..9c7fddee1a7a 100644 --- a/sys-apps/portage/portage-2.0.47-r10.ebuild +++ b/sys-apps/portage/portage-2.0.47-r10.ebuild @@ -1,5 +1,5 @@ # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r10.ebuild,v 1.8 2003/04/05 20:05:25 carpaski Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r10.ebuild,v 1.9 2003/04/29 15:57:26 carpaski Exp $ IUSE="build" @@ -17,22 +17,10 @@ KEYWORDS="alpha arm hppa mips ppc sparc x86" LICENSE="GPL-2" RDEPEND="!build? ( >=sys-apps/sed-4.0.5 >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )" -get_portver() { - python -c "import portage,string; print string.join(portage.pkgsplit(portage.best(portage.db[\"${ROOT}\"][\"vartree\"].dbapi.match(\"sys-apps/portage\"))))" -} - -compare_pver() { - if python -c "import portage,string,sys; sys.exit(portage.pkgcmp(string.split(\"$1\"),string.split(\"$2\"))>=0)"; then - return 0 - fi - return 1 -} - src_unpack() { cd ${WORKDIR} echo tar xjf ${DISTDIR}/${PF}.tar.bz2 tar xjf ${DISTDIR}/${PF}.tar.bz2 || die "No portage tarball in distfiles." - #get_portver > ${WORKDIR}/previous-version } src_compile() { @@ -182,7 +170,7 @@ pkg_postinst() { echo einfo "Please 'emerge sync' after merging portage to update some permissions." echo - if [ -z $PORTAGE_TEST ]; then + if [ -z "$PORTAGE_TEST" ]; then echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 sleep 5 @@ -210,7 +198,7 @@ pkg_postinst() { fi # PORTAGE_TESTING #fix cache (could contain staleness) - if [ ! -d ${ROOT}var/cache/edb/dep ] + if [ ! -d "${ROOT}var/cache/edb/dep" ] then #upgrade /var/db/pkg library; conditional required for build image creation if [ -d ${ROOT}var/db/pkg ] @@ -247,7 +235,7 @@ pkg_postinst() { python -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die python -O -c "import py_compile; py_compile.compile('${ROOT}usr/lib/portage/bin/emergehelp.py')" || die - if has ccache $FEATURES && has userpriv $FEATURES; then + if has ccache $FEATURES &>/dev/null && has userpriv $FEATURES &>/dev/null; then chown -R portage:portage /var/tmp/ccache &> /dev/null chmod -R g+rws /var/tmp/ccache &>/dev/null fi |