vmware-workstation/7.0.1.227600/vmware-workstation.py.patch

--- vmware-workstation.py.orig	2010-02-04 18:50:30.000000000 +0000
+++ vmware-workstation.py	2010-02-25 18:25:37.000000000 +0000
@@ -4,11 +4,12 @@
 VMware Workstation component installer.
 """
 DEST = LIBDIR/'vmware'
-conf = DEST/'setup/vmware-config'
+import os
+conf = path(os.environ['SRCDIR'])/'vmware-config.sh'
 
-LIMITSFILE = Destination('/etc/security/limits.conf')
+LIMITSFILE = SYSCONFDIR/'security/limits.conf'
 NOFILE_MINIMUM = 4096
-PAMLOGINFILE = Destination('/etc/pam.d/login')
+PAMLOGINFILE = SYSCONFDIR/'pam.d/login'
 
 vmwareSentinel = '# Automatically generated by the VMware Installer - DO NOT REMOVE\n'
 pamLoginLine = 'session    required   pam_limits.so\n'
@@ -109,7 +110,7 @@
       self.SetPermission(DEST/'bin/*', BINARY)
 
       eclipse = self.GetAnswer('eclipse')
-      eclipse and self.AddTarget('Link', DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
+      False and self.AddTarget('Link', DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
                                  Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0')
 
    def _killVMwareProcesses(self):
@@ -179,13 +180,13 @@
       # Player is still installed though, so we want to be
       # sure to restart the services for Player.
       script = INITSCRIPTDIR/'vmware'
-      if script.exists():
+      if False:
          self.RunCommand(script, 'stop', ignoreErrors=True)
          self.RunCommand(script, 'start')
 
    def _ClearVMwareEclipseINI(self):
       eclipse = self.GetAnswer('eclipse')
-      if eclipse:
+      if False:
          try:
             # Check if our section already exists at the beginning
             # of the file.  If it does clear it.
@@ -202,7 +203,7 @@
    def _ModifyEclipseINI(self):
       eclipse = self.GetAnswer('eclipse')
       log.Debug('ModifyINI: Eclipse is: %s', eclipse)
-      if eclipse:
+      if False:
          log.Debug('ModifyINI: Eclipse path was found at %s', eclipse)
          # Modify the eclipse.ini file to include the lines:
          # -vm
@@ -234,7 +235,7 @@
       missingFeatures = []
       pluginDir = DEST/'eclipse-ng'
       xmlfile = pluginDir/'feature.xml'
-      if xmlfile.exists():
+      if False:
          text = xmlfile.bytes()
          req = str(re.findall('<requires>.*</requires>', text, re.DOTALL))
          reqPlugins = re.findall('import plugin="(.*?)"', str(req), re.DOTALL)
@@ -284,7 +285,7 @@
       eclipse = self.GetAnswer('eclipse')
       eclipseCCPP = self.GetAnswer('eclipseCCPP')
       log.Debug('Eclipse(C/C++): Eclipse is: %s', eclipse)
-      if eclipse and eclipseCCPP.lower() == 'yes':
+      if False and eclipseCCPP.lower() == 'yes':
          success=False
          pluginPath = DEST/'eclipse-ng'
          configFile = pluginPath/'vmware-eclipse-update-site.config'
@@ -459,7 +460,7 @@
       # to check.
       nofileHL = self.GetAnswer('nofileHardLimit')
       if nofileHL and (self.hardLimit != int(nofileHL)):
-         limitsFile = Destination('/etc/security/limits.conf')
+         limitsFile = LIMITSFILE
          if limitsFile.exists():
             self._ClearVMwareLimitsConf(limitsFile, restoreEntry=False)
             log.Debug('Modifying /etc/security/limits.conf hard limit from '
1	--- vmware-workstation.py.orig 2010-02-04 18:50:30.000000000 +0000
2	+++ vmware-workstation.py 2010-02-25 18:25:37.000000000 +0000
3	@@ -4,11 +4,12 @@
4	VMware Workstation component installer.
5	"""
6	DEST = LIBDIR/'vmware'
7	-conf = DEST/'setup/vmware-config'
8	+import os
9	+conf = path(os.environ['SRCDIR'])/'vmware-config.sh'
10
11	-LIMITSFILE = Destination('/etc/security/limits.conf')
12	+LIMITSFILE = SYSCONFDIR/'security/limits.conf'
13	NOFILE_MINIMUM = 4096
14	-PAMLOGINFILE = Destination('/etc/pam.d/login')
15	+PAMLOGINFILE = SYSCONFDIR/'pam.d/login'
16
17	vmwareSentinel = '# Automatically generated by the VMware Installer - DO NOT REMOVE\n'
18	pamLoginLine = 'session required pam_limits.so\n'
19	@@ -109,7 +110,7 @@
20	self.SetPermission(DEST/'bin/*', BINARY)
21
22	eclipse = self.GetAnswer('eclipse')
23	- eclipse and self.AddTarget('Link', DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
24	+ False and self.AddTarget('Link', DEST/'eclipse-ivd/com.vmware.bfg_1.0.0',
25	Destination(eclipse)/'plugins/com.vmware.bfg_1.0.0')
26
27	def _killVMwareProcesses(self):
28	@@ -179,13 +180,13 @@
29	# Player is still installed though, so we want to be
30	# sure to restart the services for Player.
31	script = INITSCRIPTDIR/'vmware'
32	- if script.exists():
33	+ if False:
34	self.RunCommand(script, 'stop', ignoreErrors=True)
35	self.RunCommand(script, 'start')
36
37	def _ClearVMwareEclipseINI(self):
38	eclipse = self.GetAnswer('eclipse')
39	- if eclipse:
40	+ if False:
41	try:
42	# Check if our section already exists at the beginning
43	# of the file. If it does clear it.
44	@@ -202,7 +203,7 @@
45	def _ModifyEclipseINI(self):
46	eclipse = self.GetAnswer('eclipse')
47	log.Debug('ModifyINI: Eclipse is: %s', eclipse)
48	- if eclipse:
49	+ if False:
50	log.Debug('ModifyINI: Eclipse path was found at %s', eclipse)
51	# Modify the eclipse.ini file to include the lines:
52	# -vm
53	@@ -234,7 +235,7 @@
54	missingFeatures = []
55	pluginDir = DEST/'eclipse-ng'
56	xmlfile = pluginDir/'feature.xml'
57	- if xmlfile.exists():
58	+ if False:
59	text = xmlfile.bytes()
60	req = str(re.findall('<requires>.*</requires>', text, re.DOTALL))
61	reqPlugins = re.findall('import plugin="(.*?)"', str(req), re.DOTALL)
62	@@ -284,7 +285,7 @@
63	eclipse = self.GetAnswer('eclipse')
64	eclipseCCPP = self.GetAnswer('eclipseCCPP')
65	log.Debug('Eclipse(C/C++): Eclipse is: %s', eclipse)
66	- if eclipse and eclipseCCPP.lower() == 'yes':
67	+ if False and eclipseCCPP.lower() == 'yes':
68	success=False
69	pluginPath = DEST/'eclipse-ng'
70	configFile = pluginPath/'vmware-eclipse-update-site.config'
71	@@ -459,7 +460,7 @@
72	# to check.
73	nofileHL = self.GetAnswer('nofileHardLimit')
74	if nofileHL and (self.hardLimit != int(nofileHL)):
75	- limitsFile = Destination('/etc/security/limits.conf')
76	+ limitsFile = LIMITSFILE
77	if limitsFile.exists():
78	self._ClearVMwareLimitsConf(limitsFile, restoreEntry=False)
79	log.Debug('Modifying /etc/security/limits.conf hard limit from '