Magellan Linux

Diff of /trunk/vmware-workstation/patches/vmware-workstation-7.0.1.227600-installer-2.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1026 by niro, Sun Apr 25 19:13:30 2010 UTC revision 1027 by niro, Sun Apr 25 19:24:35 2010 UTC
# Line 16  diff -Naur payload.orig/install/vmware-i Line 16  diff -Naur payload.orig/install/vmware-i
16            # Create necessary bootstrap files            # Create necessary bootstrap files
17  -         bootstrap = CONFDIR/'bootstrap'  -         bootstrap = CONFDIR/'bootstrap'
18  +         import os  +         import os
19  +         bootstrap = path(os.environ['WORKDIR'])/'vmware-confdir/bootstrap'  +         bootstrap = path(os.environ['SRCDIR'])/'vmware-confdir/bootstrap'
20            bootstrap.write_bytes('VMWARE_INSTALLER="%s"\n\n' % DEST, append=False)            bootstrap.write_bytes('VMWARE_INSTALLER="%s"\n\n' % DEST, append=False)
21            bootstrap.write_bytes('VERSION="%s"\n' % '1.1', append=True)            bootstrap.write_bytes('VERSION="%s"\n' % '1.1', append=True)
22            bootstrap.write_bytes('VMISPYVERSION="%s"\n' % PYTHON_VERSION, append=True)            bootstrap.write_bytes('VMISPYVERSION="%s"\n' % PYTHON_VERSION, append=True)
# Line 65  diff -Naur payload.orig/install/vmware-i Line 65  diff -Naur payload.orig/install/vmware-i
65      # Python will interpret as being a module separator      # Python will interpret as being a module separator
66      moduleName = component.name.replace('.', '')      moduleName = component.name.replace('.', '')
67      fileObj, pathName, description = imp.find_module(moduleName, [loadPath])      fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
68  +   print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],  +   print output(os.path.join(env['ENV'].get('SRCDIR', './'), 'module_patcher.sh'), pathName)[1],
69  +   fileObj = file(pathName)  +   fileObj = file(pathName)
70    
71      componentCoreVersion = component.coreVersion      componentCoreVersion = component.coreVersion
# Line 98  diff -Naur payload.orig/install/vmware-i Line 98  diff -Naur payload.orig/install/vmware-i
98         """         """
99         super(InitDir, self).Validate(answer)         super(InitDir, self).Validate(answer)
100    
101  +      ### GENTOO PATCH ###  Finish early  +      ### Magellan specific - adopted from GENTOO PATCH - Finish early ###
102  +      return True  +      return True
103  +  +
104         rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')         rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')

Legend:
Removed from v.1026  
changed lines
  Added in v.1027