summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Auty <ikelos@gentoo.org>2008-11-10 10:56:23 +0000
committerMike Auty <ikelos@gentoo.org>2008-11-10 10:56:23 +0000
commiteecdc1b2a1addb3f4544fb5154b218c50e7856d8 (patch)
tree63fb635983768b4ff7aad4b2faa926ff54086474 /app-emulation
parentAdd ~ia64 wrt #241908 (diff)
downloadgentoo-2-eecdc1b2a1addb3f4544fb5154b218c50e7856d8.tar.gz
gentoo-2-eecdc1b2a1addb3f4544fb5154b218c50e7856d8.tar.bz2
gentoo-2-eecdc1b2a1addb3f4544fb5154b218c50e7856d8.zip
Ensure it dies properly and put in a better check for screen.
(Portage version: 2.2_rc13/cvs/Linux 2.6.27-gentoo-r1 i686)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/vmware-player/ChangeLog6
-rw-r--r--app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild11
2 files changed, 14 insertions, 3 deletions
diff --git a/app-emulation/vmware-player/ChangeLog b/app-emulation/vmware-player/ChangeLog
index 5c35a08308f7..ae37761f98e6 100644
--- a/app-emulation/vmware-player/ChangeLog
+++ b/app-emulation/vmware-player/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/vmware-player
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.59 2008/11/10 10:40:28 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.60 2008/11/10 10:56:23 ikelos Exp $
+
+ 10 Nov 2008; Mike Auty <ikelos@gentoo.org>
+ vmware-player-2.5.0.118166.ebuild:
+ Ensure it dies properly and put in a better check for screen.
10 Nov 2008; Mike Auty <ikelos@gentoo.org>
+files/2.5.0.118166/vmware-player.py.patch,
diff --git a/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild b/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild
index 5c49adfe4722..872d941c0d54 100644
--- a/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild
+++ b/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild,v 1.2 2008/11/09 21:43:02 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.0.118166.ebuild,v 1.3 2008/11/10 10:56:23 ikelos Exp $
inherit eutils versionator fdo-mime gnome2-utils
@@ -64,7 +64,7 @@ pkg_setup() {
die "Please rebuild dev-lang/python with sqlite USE flag!"
fi
- if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "" ]; then
+ if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
die "Please emerge this package using a different terminal"
fi
}
@@ -110,6 +110,13 @@ src_install() {
rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
+ if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
+ eerror "VMware installation seems to have rolled back."
+ eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
+ eerror "in any bug reports you file."
+ die "VMware installation rolled back."
+ fi
+
# Redirect all the ${D} paths to / paths"
sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap