summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Auty <ikelos@gentoo.org>2008-11-10 11:00:16 +0000
committerMike Auty <ikelos@gentoo.org>2008-11-10 11:00:16 +0000
commit4751b04ba26e0e1f41cc9608b6aa79fbf5b14181 (patch)
tree7a6073b15ebb65c2f56dad11ada39760ab27389a /app-emulation/vmware-workstation
parentUse.mask dxr3, no hardware to test (diff)
downloadgentoo-2-4751b04ba26e0e1f41cc9608b6aa79fbf5b14181.tar.gz
gentoo-2-4751b04ba26e0e1f41cc9608b6aa79fbf5b14181.tar.bz2
gentoo-2-4751b04ba26e0e1f41cc9608b6aa79fbf5b14181.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/vmware-workstation')
-rw-r--r--app-emulation/vmware-workstation/ChangeLog6
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild11
2 files changed, 14 insertions, 3 deletions
diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index 88025dbb4081..069d5a023d44 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/vmware-workstation
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.184 2008/11/09 20:56:55 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.185 2008/11/10 11:00:16 ikelos Exp $
+
+ 10 Nov 2008; Mike Auty <ikelos@gentoo.org>
+ vmware-workstation-6.5.0.118166.ebuild:
+ Ensure it dies properly and put in a better check for screen.
*vmware-workstation-6.5.0.118166 (09 Nov 2008)
*vmware-workstation-5.5.9.126128 (09 Nov 2008)
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild
index d90d639467ff..35342c7d7a14 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.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-workstation/vmware-workstation-6.5.0.118166.ebuild,v 1.2 2008/11/09 21:41:32 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-6.5.0.118166.ebuild,v 1.3 2008/11/10 11:00:16 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