Annotation of /trunk/vmware-workstation/7.0.1.227600/vmware-player-app.py.patch
Parent Directory | Revision Log
Revision 1030 -
(hide annotations)
(download)
Sun Apr 25 20:38:55 2010 UTC (14 years, 5 months ago) by niro
File size: 2866 byte(s)
Sun Apr 25 20:38:55 2010 UTC (14 years, 5 months ago) by niro
File size: 2866 byte(s)
-fixed patches
1 | niro | 1027 | --- vmware-player-app.py.orig 2010-02-04 19:50:15.000000000 +0100 |
2 | +++ vmware-player-app.py 2010-02-27 21:05:08.000000000 +0100 | ||
3 | @@ -6,7 +6,8 @@ | ||
4 | |||
5 | GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults' | ||
6 | DEST = LIBDIR/'vmware' | ||
7 | -CONFIG = DEST/'setup/vmware-config' | ||
8 | +import os | ||
9 | niro | 1030 | +CONFIG=path(os.environ['SRCDIR'])/'vmware-config.sh' |
10 | niro | 1027 | CUPSLIBDIR = LIBDIR/'cups' |
11 | SETTINGS = \ | ||
12 | { 'libdir': DEST, | ||
13 | @@ -25,7 +26,7 @@ | ||
14 | |||
15 | # Player and Workstation both depend on some configuration living | ||
16 | # in /etc/vmware | ||
17 | -ETCDIR = Destination('/etc/vmware') | ||
18 | +ETCDIR = SYSCONFDIR/'vmware' | ||
19 | |||
20 | class PlayerApp(Installer): | ||
21 | def PreTransactionInstall(self, old, new, upgrade): | ||
22 | @@ -106,13 +107,14 @@ | ||
23 | not themeIndex.exists() and self.AddTarget('File', 'files/index.theme', themeIndex) | ||
24 | |||
25 | # Services | ||
26 | - self.RegisterService(name='vmware', src='etc/init.d/services.sh', start=19, stop=8) | ||
27 | + self.AddTarget('File', 'etc/init.d/services.sh', ETCDIR/'init.d/vmware') | ||
28 | + # self.RegisterService(name='vmware', src='etc/init.d/services.sh', start=19, stop=8) | ||
29 | |||
30 | # modprobe.d script. Only install this on systems where modprobe.d | ||
31 | # exists. | ||
32 | if path('/etc/modprobe.d').exists(): | ||
33 | self.AddTarget('File', 'etc/modprobe.d/modprobe-vmware-fuse.conf', | ||
34 | - '/etc/modprobe.d/vmware-fuse.conf') | ||
35 | + SYSCONFDIR/'modprobe.d/vmware-fuse.conf') | ||
36 | |||
37 | def _scriptRunnable(self, script): | ||
38 | """ Returns True if the script exists and is in a runnable state """ | ||
39 | @@ -178,7 +180,7 @@ | ||
40 | for module in modules: | ||
41 | for ext in ('o', 'ko'): | ||
42 | mod = '%s.%s' % (module, ext) | ||
43 | - (base/mod).remove(ignore_errors=True) | ||
44 | +# (base/mod).remove(ignore_errors=True) | ||
45 | |||
46 | # Make sure we kill all processes that should not be running! | ||
47 | self._killVMwareProcesses() | ||
48 | @@ -228,9 +230,10 @@ | ||
49 | for key, val in SETTINGS.items(): | ||
50 | self.RunCommand(CONFIG, '-s', key, val) | ||
51 | |||
52 | - bootstrap = ETCDIR/'bootstrap' | ||
53 | + import os | ||
54 | niro | 1030 | + bootstrap = path(os.environ['SRCDIR'])/'vmware-confdir/bootstrap' |
55 | niro | 1027 | # Create the bootstrap file. |
56 | - bootstrap.unlink(ignore_errors=True) | ||
57 | + #bootstrap.unlink(ignore_errors=True) | ||
58 | # Fill it. | ||
59 | for i in ('PREFIX', 'BINDIR', 'SBINDIR', 'LIBDIR', 'DATADIR', | ||
60 | 'SYSCONFDIR', 'DOCDIR', 'MANDIR', 'INCLUDEDIR', 'INITDIR', | ||
61 | @@ -343,7 +346,8 @@ | ||
62 | |||
63 | def _isGConfUsable(self): | ||
64 | """ Return True if GConf settings can be configured, otherwise False """ | ||
65 | - return self.RunCommand('gconftool-2', '--help', ignoreErrors=True, noLogging=True).retCode == 0 | ||
66 | + return False | ||
67 | +# return self.RunCommand('gconftool-2', '--help', ignoreErrors=True, noLogging=True).retCode == 0 | ||
68 | |||
69 | def _configureVMStreamingHandlers(self): | ||
70 | """ Configures handlers for vm:// and vms:// used for VM streaming """ |