| 1 |
vadimk 10/12/29 20:08:47 |
| 2 |
|
| 3 |
Added: vmware-workstation-6.5.5.328052-installer.patch |
| 4 |
Log: |
| 5 |
Version bump. Bugs 350073, 345377 |
| 6 |
|
| 7 |
(Portage version: 2.1.9.26/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-emulation/vmware-workstation/files/vmware-workstation-6.5.5.328052-installer.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/vmware-workstation-6.5.5.328052-installer.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-workstation/files/vmware-workstation-6.5.5.328052-installer.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: vmware-workstation-6.5.5.328052-installer.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py |
| 18 |
index 7a46312..e1dbff1 100644 |
| 19 |
--- a/payload/install/vmware-installer/vmis/__init__.py |
| 20 |
+++ b/payload/install/vmware-installer/vmis/__init__.py |
| 21 |
@@ -12,5 +12,5 @@ VERSION_INFO = (1,0) |
| 22 |
VERSION = '.'.join([str(x) for x in VERSION_INFO]) |
| 23 |
MAJOR_VERSION = VERSION_INFO[0] |
| 24 |
|
| 25 |
-CONFDIR = path(u'/etc/vmware') |
| 26 |
+CONFDIR = path(u'./vmware-confdir') |
| 27 |
DATABASE_PATH = CONFDIR/'database' |
| 28 |
diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py |
| 29 |
index e7abc2e..81c4a2b 100644 |
| 30 |
--- a/payload/install/vmware-installer/vmis/core/env.py |
| 31 |
+++ b/payload/install/vmware-installer/vmis/core/env.py |
| 32 |
@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath): |
| 33 |
# Python will interrept as being a module separator |
| 34 |
moduleName = component.name.replace('.', '') |
| 35 |
fileObj, pathName, description = imp.find_module(moduleName, [loadPath]) |
| 36 |
+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1], |
| 37 |
+ fileObj = file(pathName) |
| 38 |
|
| 39 |
try: |
| 40 |
# XXX: db.config cannot be set at the module level because this |
| 41 |
diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py |
| 42 |
index 2be10de..f92ecff 100644 |
| 43 |
--- a/payload/install/vmware-installer/vmis/core/questions.py |
| 44 |
+++ b/payload/install/vmware-installer/vmis/core/questions.py |
| 45 |
@@ -139,6 +139,9 @@ class InitDir(Directory): |
| 46 |
""" |
| 47 |
super(InitDir, self).Validate(answer) |
| 48 |
|
| 49 |
+ ### GENTOO PATCH ### Finish early |
| 50 |
+ return True |
| 51 |
+ |
| 52 |
rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d') |
| 53 |
answer = path(answer) |
| 54 |
|
| 55 |
diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py |
| 56 |
index 525df75..abb81b3 100644 |
| 57 |
--- a/payload/install/vmware-installer/vmis/ui/console.py |
| 58 |
+++ b/payload/install/vmware-installer/vmis/ui/console.py |
| 59 |
@@ -148,7 +148,7 @@ class Wizard(object): |
| 60 |
wrapper = TextWrapper() |
| 61 |
wrapper.width = 79 |
| 62 |
wrapper.replace_whitespace = False # Needed to preserve paragraph spacing. |
| 63 |
- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text)) |
| 64 |
+ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text)) |
| 65 |
except IOError: # RHEL4 appears to close stdin while we still expect it to be open |
| 66 |
pass |
| 67 |
|
| 68 |
diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py |
| 69 |
index 4f609c4..b07b89d 100644 |
| 70 |
--- a/payload/install/vmware-installer/vmis/util/log.py |
| 71 |
+++ b/payload/install/vmware-installer/vmis/util/log.py |
| 72 |
@@ -22,6 +22,8 @@ else: |
| 73 |
# running a build) |
| 74 |
LOG_FILE = '/tmp/vmware-installer.log' |
| 75 |
|
| 76 |
+LOG_FILE = './vmware-installer.log' |
| 77 |
+ |
| 78 |
if level <= logging.DEBUG: |
| 79 |
MAX_BYTES = 0 |
| 80 |
BACKUP_COUNT = 0 |
Archives