Contents of /trunk/vmware-workstation/patches/vmware-workstation-7.0.1.227600-installer-2.patch
Parent Directory | Revision Log
Revision 1026 -
(show annotations)
(download)
Sun Apr 25 19:13:30 2010 UTC (14 years, 5 months ago) by niro
File size: 8007 byte(s)
Sun Apr 25 19:13:30 2010 UTC (14 years, 5 months ago) by niro
File size: 8007 byte(s)
fixed patchwork
1 | diff -Naur payload.orig/install/vmware-installer/.installer/1.1/vmware-installer.py payload/install/vmware-installer/.installer/1.1/vmware-installer.py |
2 | --- payload.orig/install/vmware-installer/.installer/1.1/vmware-installer.py 2010-02-04 19:50:58.000000000 +0100 |
3 | +++ payload/install/vmware-installer/.installer/1.1/vmware-installer.py 2010-02-24 00:05:53.000000000 +0100 |
4 | @@ -10,7 +10,7 @@ |
5 | |
6 | # The 1.0 Installer looks in very specific locations for existing installs |
7 | # (/etc/vmware and /etc/vmware-vix) |
8 | -OLDCONFDIR = Destination('/etc/vmware') |
9 | +OLDCONFDIR = SYSCONFDIR/'vmware' |
10 | OLDBOOTSTRAPS = ['/etc/vmware', '/etc/vmware-vix'] |
11 | |
12 | installerLinks = ['vmware-installer', 'vmware-uninstall', |
13 | @@ -149,7 +149,8 @@ |
14 | path(bin/'vmware-installer').symlink(str(BINDIR/'vmware-installer')) |
15 | |
16 | # Create necessary bootstrap files |
17 | - bootstrap = CONFDIR/'bootstrap' |
18 | + import os |
19 | + bootstrap = path(os.environ['WORKDIR'])/'vmware-confdir/bootstrap' |
20 | bootstrap.write_bytes('VMWARE_INSTALLER="%s"\n\n' % DEST, append=False) |
21 | bootstrap.write_bytes('VERSION="%s"\n' % '1.1', append=True) |
22 | bootstrap.write_bytes('VMISPYVERSION="%s"\n' % PYTHON_VERSION, append=True) |
23 | @@ -159,7 +160,7 @@ |
24 | # don't already exist |
25 | for bstrap in OLDBOOTSTRAPS: |
26 | bootstrap = path(bstrap)/'bootstrap' |
27 | - if not bootstrap.exists(): |
28 | + if False: |
29 | try: |
30 | path(bstrap).makedirs() |
31 | except OSError: |
32 | @@ -228,7 +229,7 @@ |
33 | # don't clean up the bootstrap files. |
34 | for suffix in ['', '-vix']: |
35 | oldfile = path('/etc/vmware%s/bootstrap' % suffix) |
36 | - if oldfile.exists(): |
37 | + if False: |
38 | text = oldfile.bytes() |
39 | if text.find('VERSION="1.0"') != -1: |
40 | bstraps.remove('/etc/vmware%s' % suffix) |
41 | diff -Naur payload.orig/install/vmware-installer/vmis/core/common.py payload/install/vmware-installer/vmis/core/common.py |
42 | --- payload.orig/install/vmware-installer/vmis/core/common.py 2010-02-04 19:50:58.000000000 +0100 |
43 | +++ payload/install/vmware-installer/vmis/core/common.py 2010-02-05 17:31:31.000000000 +0100 |
44 | @@ -247,4 +247,3 @@ |
45 | # nonexistant DB. |
46 | SYSTEM_BOOTSTRAP = path('/etc/vmware-installer/bootstrap') |
47 | SYSTEM_DATABASE = path('/etc/vmware-installer/database') |
48 | - |
49 | diff -Naur payload.orig/install/vmware-installer/vmis/core/dependency.py payload/install/vmware-installer/vmis/core/dependency.py |
50 | --- payload.orig/install/vmware-installer/vmis/core/dependency.py 2010-02-04 19:50:58.000000000 +0100 |
51 | +++ payload/install/vmware-installer/vmis/core/dependency.py 2010-02-04 19:57:42.000000000 +0100 |
52 | @@ -291,7 +291,7 @@ |
53 | log.debug(' found match: %s' % possibleDep) |
54 | node.addDependency(possibleDep, dependency.optional) |
55 | matched = True |
56 | - if not matched and not dependency.optional and not force: |
57 | + if False: |
58 | exception = UnsatisfiedDependency('Component %s has unsatisfied ' |
59 | 'dependency: %s' % (node.component, |
60 | dependency)) |
61 | diff -Naur payload.orig/install/vmware-installer/vmis/core/env.py payload/install/vmware-installer/vmis/core/env.py |
62 | --- payload.orig/install/vmware-installer/vmis/core/env.py 2010-02-04 19:50:58.000000000 +0100 |
63 | +++ payload/install/vmware-installer/vmis/core/env.py 2010-02-04 19:56:51.000000000 +0100 |
64 | @@ -305,6 +305,8 @@ |
65 | # Python will interpret as being a module separator |
66 | moduleName = component.name.replace('.', '') |
67 | fileObj, pathName, description = imp.find_module(moduleName, [loadPath]) |
68 | + print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1], |
69 | + fileObj = file(pathName) |
70 | |
71 | componentCoreVersion = component.coreVersion |
72 | if component.name == 'vmware-installer': # XXX: HARDCODE - Fix this. |
73 | diff -Naur payload.orig/install/vmware-installer/vmis/core/files.py payload/install/vmware-installer/vmis/core/files.py |
74 | --- payload.orig/install/vmware-installer/vmis/core/files.py 2010-02-04 19:50:58.000000000 +0100 |
75 | +++ payload/install/vmware-installer/vmis/core/files.py 2010-02-09 00:09:20.000000000 +0100 |
76 | @@ -17,7 +17,8 @@ |
77 | Check to see if VMIS_COMPONENT_ONLY is defined. Return true if it is, |
78 | false otherwise. |
79 | """ |
80 | - return 'VMIS_COMPONENT_ONLY' in globals() |
81 | + return False |
82 | +# return 'VMIS_COMPONENT_ONLY' in globals() |
83 | |
84 | |
85 | # XXX: This could be handled better. |
86 | @@ -196,6 +197,7 @@ |
87 | id = 0 |
88 | |
89 | def Install(self, component, dest, precopy=None): |
90 | + |
91 | if self.IsRelative(): |
92 | entries = list(component.Glob(self)) |
93 | |
94 | diff -Naur payload.orig/install/vmware-installer/vmis/core/questions.py payload/install/vmware-installer/vmis/core/questions.py |
95 | --- payload.orig/install/vmware-installer/vmis/core/questions.py 2010-02-04 19:50:58.000000000 +0100 |
96 | +++ payload/install/vmware-installer/vmis/core/questions.py 2010-02-04 19:56:51.000000000 +0100 |
97 | @@ -199,6 +199,9 @@ |
98 | """ |
99 | super(InitDir, self).Validate(answer) |
100 | |
101 | + ### GENTOO PATCH ### Finish early |
102 | + return True |
103 | + |
104 | rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d') |
105 | answer = path(answer) |
106 | |
107 | diff -Naur payload.orig/install/vmware-installer/vmis/db.py payload/install/vmware-installer/vmis/db.py |
108 | --- payload.orig/install/vmware-installer/vmis/db.py 2010-02-04 19:50:58.000000000 +0100 |
109 | +++ payload/install/vmware-installer/vmis/db.py 2010-02-04 21:23:04.000000000 +0100 |
110 | @@ -569,7 +569,7 @@ |
111 | |
112 | if row: |
113 | coreID = row['id']; |
114 | - else: |
115 | + elif False: |
116 | cur = self._db.execute(u'SELECT id, name, version FROM components WHERE name="vmware-installer"') |
117 | rows = cur.fetchone(); |
118 | cur.close(); |
119 | diff -Naur payload.orig/install/vmware-installer/vmis/__init__.py payload/install/vmware-installer/vmis/__init__.py |
120 | --- payload.orig/install/vmware-installer/vmis/__init__.py 2010-02-04 19:50:58.000000000 +0100 |
121 | +++ payload/install/vmware-installer/vmis/__init__.py 2010-02-04 19:56:51.000000000 +0100 |
122 | @@ -20,7 +20,7 @@ |
123 | MAJOR_VERSION = VERSION_INFO[0] |
124 | VMISPYVERSION = os.environ.get('VMISPYVERSION') |
125 | |
126 | -CONFDIR = path(u'/etc/vmware-installer') |
127 | +CONFDIR = path(u'./vmware-confdir') |
128 | DATABASE_PATH = CONFDIR/'database' |
129 | |
130 | # Database setting for use by the installer and its component. |
131 | diff -Naur payload.orig/install/vmware-installer/vmis/util/log.py payload/install/vmware-installer/vmis/util/log.py |
132 | --- payload.orig/install/vmware-installer/vmis/util/log.py 2010-02-04 19:50:58.000000000 +0100 |
133 | +++ payload/install/vmware-installer/vmis/util/log.py 2010-02-04 19:56:51.000000000 +0100 |
134 | @@ -24,12 +24,13 @@ |
135 | username = pwd.getpwuid(os.getuid())[0] |
136 | dirname = '/tmp/vmware-%s' % username |
137 | LOG_FILE = '%s/vmware-installer.log' % dirname |
138 | +LOG_FILE = './vmware-installer.log' |
139 | # Make sure this directory exists. Assuming /tmp exists. |
140 | - try: |
141 | - os.mkdir(dirname) |
142 | - except OSError: |
143 | +# try: |
144 | +# os.mkdir(dirname) |
145 | +# except OSError: |
146 | # It's okay if it already exists |
147 | - pass |
148 | +# pass |
149 | |
150 | if level <= logging.DEBUG: |
151 | MAX_BYTES = 0 |
152 | diff -Naur payload.orig/install/vmware-installer/vmware-installer.py payload/install/vmware-installer/vmware-installer.py |
153 | --- payload.orig/install/vmware-installer/vmware-installer.py 2010-02-04 19:50:58.000000000 +0100 |
154 | +++ payload/install/vmware-installer/vmware-installer.py 2010-02-09 00:09:45.000000000 +0100 |
155 | @@ -200,7 +200,7 @@ |
156 | # if it exists and continue with installation. |
157 | dbase = SYSTEM_DATABASE |
158 | if dbase.exists(): |
159 | - dbase.remove(ignore_errors=True); |
160 | +# dbase.remove(ignore_errors=True); |
161 | log.error('Bootstrap file was missing, but database file exists. ' |
162 | 'Installer system state is corrupted. Removing ' |
163 | '%s and starting with an empty installer database.' |