Magellan Linux

Annotation of /trunk/vmware-workstation/patches/vmware-workstation-6.5.2.156735-installer.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 852 - (hide annotations) (download)
Mon Jun 15 21:54:19 2009 UTC (15 years ago) by niro
File size: 3049 byte(s)
-files for vmware

1 niro 852 diff -Naur a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
2     --- a/payload/install/vmware-installer/vmis/core/env.py 2009-03-27 06:59:22.000000000 +0100
3     +++ b/payload/install/vmware-installer/vmis/core/env.py 2009-06-15 22:43:55.000000000 +0200
4     @@ -66,6 +66,8 @@
5     # Python will interrept as being a module separator
6     moduleName = component.name.replace('.', '')
7     fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
8     + print output(os.path.join(env['ENV'].get('BUILDDIR', './'), 'module_patcher.sh'), pathName)[1],
9     + fileObj = file(pathName)
10    
11     try:
12     # XXX: db.config cannot be set at the module level because this
13     diff -Naur a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
14     --- a/payload/install/vmware-installer/vmis/core/questions.py 2009-03-27 06:59:22.000000000 +0100
15     +++ b/payload/install/vmware-installer/vmis/core/questions.py 2009-06-15 22:45:11.000000000 +0200
16     @@ -139,6 +139,9 @@
17     """
18     super(InitDir, self).Validate(answer)
19    
20     + ### Magellan specific - adopted from GENTOO PATCH - Finish early ###
21     + return True
22     +
23     rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
24     answer = path(answer)
25    
26     diff -Naur a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
27     --- a/payload/install/vmware-installer/vmis/__init__.py 2009-03-27 06:59:22.000000000 +0100
28     +++ b/payload/install/vmware-installer/vmis/__init__.py 2009-06-15 22:43:18.000000000 +0200
29     @@ -12,5 +12,5 @@
30     VERSION = '.'.join([str(x) for x in VERSION_INFO])
31     MAJOR_VERSION = VERSION_INFO[0]
32    
33     -CONFDIR = path(u'/etc/vmware')
34     +CONFDIR = path(u'./vmware-confdir')
35     DATABASE_PATH = CONFDIR/'database'
36     diff -Naur a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
37     --- a/payload/install/vmware-installer/vmis/ui/console.py 2009-03-27 06:59:22.000000000 +0100
38     +++ b/payload/install/vmware-installer/vmis/ui/console.py 2009-06-15 22:45:36.000000000 +0200
39     @@ -148,7 +148,7 @@
40     wrapper = TextWrapper()
41     wrapper.width = 79
42     wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
43     - Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
44     + Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
45     except IOError: # RHEL4 appears to close stdin while we still expect it to be open
46     pass
47    
48     diff -Naur a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
49     --- a/payload/install/vmware-installer/vmis/util/log.py 2009-03-27 01:31:38.000000000 +0100
50     +++ b/payload/install/vmware-installer/vmis/util/log.py 2009-06-15 22:46:11.000000000 +0200
51     @@ -22,6 +22,8 @@
52     # running a build)
53     LOG_FILE = '/tmp/vmware-installer.log'
54    
55     +LOG_FILE = './vmware-installer.log'
56     +
57     if level <= logging.DEBUG:
58     MAX_BYTES = 0
59     BACKUP_COUNT = 0