Magellan Linux

Contents of /trunk/vmware-workstation/7.0.1.227600/vmware-player.py.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1030 - (show annotations) (download)
Sun Apr 25 20:38:55 2010 UTC (14 years ago) by niro
File size: 2935 byte(s)
-fixed patches

1 diff --git a/vmware-player.py b/vmware-player.py
2 index bee22df..d06cca9 100644
3 --- a/vmware-player.py
4 +++ b/vmware-player.py
5 @@ -6,7 +6,8 @@ VMware Player component installer.
6
7 GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
8 DEST = LIBDIR/'vmware'
9 -CONFIG = DEST/'setup/vmware-config'
10 +import os
11 +CONFIG = path(os.environ['SRCDIR'])/'vmware-config.sh'
12 CUPSLIBDIR = LIBDIR/'cups'
13 # XXX: LIBDIR should be properly calculated, to make this cleaner
14 if (PREFIX/'lib64/cups').exists():
15 @@ -84,12 +85,12 @@ class Player(Installer):
16 ret, kvers = output('uname', '-r')
17 kvers = kvers.strip()
18 modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
19 - base = path('/lib/modules/%s/misc' % kvers)
20 + base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
21
22 for module in modules:
23 for ext in ('o', 'ko'):
24 mod = '%s.%s' % (module, ext)
25 - (base/mod).remove(ignore_errors=True)
26 + # (base/mod).remove(ignore_errors=True)
27
28 def PreUninstall(self, old, new, upgrade):
29 script = INITSCRIPTDIR/'vmware'
30 @@ -156,8 +157,8 @@ class Player(Installer):
31 def PostTransactionInstall(self, old, new, upgrade):
32 if ENV.get('VMWARE_SKIP_MODULES'):
33 log.info('Skipping kernel module installation')
34 - elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
35 - log.info('Successfully installed kernel modules')
36 + # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
37 + # log.info('Successfully installed kernel modules')
38 else:
39 log.info('Unable to install kernel modules')
40
41 @@ -189,8 +190,8 @@ class Player(Installer):
42 for handler in ('vm', 'vms'):
43 for gconfType, key, value in settings:
44 key = key % handler
45 - run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
46 - '--type', gconfType, '--set', key, value)
47 + # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
48 + # '--type', gconfType, '--set', key, value)
49
50 # Instruct all gconfd daemons to reload.
51 run('killall', '-HUP', 'gconfd-2')
52 @@ -200,9 +201,9 @@ class Player(Installer):
53 def _deconfigureVMStreamingHandlers(self):
54 """ Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
55 def deconfigureGConf():
56 - for handler in ('vm', 'vms'):
57 - run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
58 - '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
59 + # for handler in ('vm', 'vms'):
60 + # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
61 + # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
62
63 # Instruct all gconfd daemons to reload.
64 run('killall', '-HUP', 'gconfd-2')