Annotation of /trunk/vmware-workstation/patches/vmware-workstation-7.0.1.227600-installer.patch
Parent Directory
| 
Revision Log
Revision 1025 -
(hide annotations)
(download)
Sun Apr 25 18:03:42 2010 UTC (14 years, 1 month ago) by niro
File size: 3357 byte(s)
Sun Apr 25 18:03:42 2010 UTC (14 years, 1 month ago) by niro
File size: 3357 byte(s)
re-diffed for 7.0.1
| 1 | niro | 1025 | diff -Naur vmware-distrib/payload/install/vmware-installer/vmis/core/env.py vmware-distrib-magellan/payload/install/vmware-installer/vmis/core/env.py |
| 2 | --- vmware-distrib/payload/install/vmware-installer/vmis/core/env.py 2010-01-23 06:00:45.000000000 +0100 | ||
| 3 | +++ vmware-distrib-magellan/payload/install/vmware-installer/vmis/core/env.py 2010-04-25 20:00:51.000000000 +0200 | ||
| 4 | @@ -305,6 +305,8 @@ | ||
| 5 | # Python will interpret 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 | componentCoreVersion = component.coreVersion | ||
| 12 | if component.name == 'vmware-installer': # XXX: HARDCODE - Fix this. | ||
| 13 | diff -Naur vmware-distrib/payload/install/vmware-installer/vmis/core/questions.py vmware-distrib-magellan/payload/install/vmware-installer/vmis/core/questions.py | ||
| 14 | --- vmware-distrib/payload/install/vmware-installer/vmis/core/questions.py 2010-01-23 06:00:45.000000000 +0100 | ||
| 15 | +++ vmware-distrib-magellan/payload/install/vmware-installer/vmis/core/questions.py 2010-04-25 20:01:28.000000000 +0200 | ||
| 16 | @@ -199,6 +199,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 vmware-distrib/payload/install/vmware-installer/vmis/__init__.py vmware-distrib-magellan/payload/install/vmware-installer/vmis/__init__.py | ||
| 27 | --- vmware-distrib/payload/install/vmware-installer/vmis/__init__.py 2010-01-23 06:00:46.000000000 +0100 | ||
| 28 | +++ vmware-distrib-magellan/payload/install/vmware-installer/vmis/__init__.py 2010-04-25 20:01:58.000000000 +0200 | ||
| 29 | @@ -20,7 +20,7 @@ | ||
| 30 | MAJOR_VERSION = VERSION_INFO[0] | ||
| 31 | VMISPYVERSION = os.environ.get('VMISPYVERSION') | ||
| 32 | |||
| 33 | -CONFDIR = path(u'/etc/vmware-installer') | ||
| 34 | +CONFDIR = path(u'./vmware-confdir') | ||
| 35 | DATABASE_PATH = CONFDIR/'database' | ||
| 36 | |||
| 37 | # Database setting for use by the installer and its component. | ||
| 38 | diff -Naur vmware-distrib/payload/install/vmware-installer/vmis/ui/console.py vmware-distrib-magellan/payload/install/vmware-installer/vmis/ui/console.py | ||
| 39 | --- vmware-distrib/payload/install/vmware-installer/vmis/ui/console.py 2010-01-23 06:00:45.000000000 +0100 | ||
| 40 | +++ vmware-distrib-magellan/payload/install/vmware-installer/vmis/ui/console.py 2010-04-25 20:04:51.000000000 +0200 | ||
| 41 | @@ -202,7 +202,7 @@ | ||
| 42 | # If no pager is found, or cannot be found in | ||
| 43 | # the path, default to 'more'. | ||
| 44 | if not pager: | ||
| 45 | - pager = 'more' | ||
| 46 | + pager = 'less' | ||
| 47 | |||
| 48 | # Append -E to less so it quits after the last line of | ||
| 49 | # the EULA is displayed. | ||
| 50 | diff -Naur vmware-distrib/payload/install/vmware-installer/vmis/util/log.py vmware-distrib-magellan/payload/install/vmware-installer/vmis/util/log.py | ||
| 51 | --- vmware-distrib/payload/install/vmware-installer/vmis/util/log.py 2010-01-23 02:09:06.000000000 +0100 | ||
| 52 | +++ vmware-distrib-magellan/payload/install/vmware-installer/vmis/util/log.py 2010-04-25 20:05:51.000000000 +0200 | ||
| 53 | @@ -31,6 +31,8 @@ | ||
| 54 | # It's okay if it already exists | ||
| 55 | pass | ||
| 56 | |||
| 57 | +LOG_FILE = './vmware-installer.log' | ||
| 58 | + | ||
| 59 | if level <= logging.DEBUG: | ||
| 60 | MAX_BYTES = 0 | ||
| 61 | BACKUP_COUNT = 0 |