diff options
| author |   Mike Auty <ikelos@gentoo.org> | 2009-04-06 21:24:12 +0000 |
|---|---|---|
| committer | Mike Auty <ikelos@gentoo.org> | 2009-04-06 21:24:12 +0000 |
| commit | 535bf826cf0d6d96a5ddb69fb7441fb37b998557 (patch) | |
| tree | b8b6bf9264bdd3ae31a35be3d638af6fb27a4efe /app-emulation/vmware-workstation/files | |
| parent | old (diff) | |
| download | gentoo-2-535bf826cf0d6d96a5ddb69fb7441fb37b998557.tar.gz gentoo-2-535bf826cf0d6d96a5ddb69fb7441fb37b998557.tar.bz2 gentoo-2-535bf826cf0d6d96a5ddb69fb7441fb37b998557.zip | |
Version bump vmware-workstation to 6.5.2.156735.
(Portage version: 2.2_rc28/cvs/Linux i686)
Diffstat (limited to 'app-emulation/vmware-workstation/files')
| -rw-r--r-- | app-emulation/vmware-workstation/files/vmware-workstation-6.5.2.156735-installer.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation-6.5.2.156735-installer.patch b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.2.156735-installer.patch new file mode 100644 index 000000000000..80a301e5c183 --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-workstation-6.5.2.156735-installer.patch @@ -0,0 +1,64 @@ +diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py +index 7a46312..e1dbff1 100644 +--- a/payload/install/vmware-installer/vmis/__init__.py ++++ b/payload/install/vmware-installer/vmis/__init__.py +@@ -12,5 +12,5 @@ VERSION_INFO = (1,0) + VERSION = '.'.join([str(x) for x in VERSION_INFO]) + MAJOR_VERSION = VERSION_INFO[0] + +-CONFDIR = path(u'/etc/vmware') ++CONFDIR = path(u'./vmware-confdir') + DATABASE_PATH = CONFDIR/'database' +diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py +index e7abc2e..81c4a2b 100644 +--- a/payload/install/vmware-installer/vmis/core/env.py ++++ b/payload/install/vmware-installer/vmis/core/env.py +@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath): + # Python will interrept as being a module separator + moduleName = component.name.replace('.', '') + fileObj, pathName, description = imp.find_module(moduleName, [loadPath]) ++ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1], ++ fileObj = file(pathName) + + try: + # XXX: db.config cannot be set at the module level because this +diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py +index 2be10de..f92ecff 100644 +--- a/payload/install/vmware-installer/vmis/core/questions.py ++++ b/payload/install/vmware-installer/vmis/core/questions.py +@@ -139,6 +139,9 @@ class InitDir(Directory): + """ + super(InitDir, self).Validate(answer) + ++ ### GENTOO PATCH ### Finish early ++ return True ++ + rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d') + answer = path(answer) + +diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py +index 525df75..abb81b3 100644 +--- a/payload/install/vmware-installer/vmis/ui/console.py ++++ b/payload/install/vmware-installer/vmis/ui/console.py +@@ -148,7 +148,7 @@ class Wizard(object): + wrapper = TextWrapper() + wrapper.width = 79 + wrapper.replace_whitespace = False # Needed to preserve paragraph spacing. +- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text)) ++ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text)) + except IOError: # RHEL4 appears to close stdin while we still expect it to be open + pass + +diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py +index 4f609c4..b07b89d 100644 +--- a/payload/install/vmware-installer/vmis/util/log.py ++++ b/payload/install/vmware-installer/vmis/util/log.py +@@ -22,6 +22,8 @@ else: + # running a build) + LOG_FILE = '/tmp/vmware-installer.log' + ++LOG_FILE = './vmware-installer.log' ++ + if level <= logging.DEBUG: + MAX_BYTES = 0 + BACKUP_COUNT = 0 |