diff options
Diffstat (limited to 'Lib/distutils/command/install.py')
| -rw-r--r-- | Lib/distutils/command/install.py | 58 |
1 files changed, 2 insertions, 56 deletions
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index 0423e9f..b9f1c6c 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -22,8 +22,6 @@ from site import USER_BASE from site import USER_SITE -libname = sys.lib - if sys.version < "2.2": WINDOWS_SCHEME = { 'purelib': '$base', @@ -44,7 +42,7 @@ else: INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', - 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages', + 'platlib': '$platbase/lib/python$py_version_short/site-packages', 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', @@ -156,8 +154,6 @@ class install (Command): ('record=', None, "filename in which to record list of installed files"), - ('record-rpm=', None, - "filename in which to record list of installed files and directories suitable as filelist for rpm"), ] boolean_options = ['compile', 'force', 'skip-build', 'user'] @@ -233,7 +229,6 @@ class install (Command): #self.install_info = None self.record = None - self.record_rpm = None # -- Option finalizing methods ------------------------------------- @@ -583,61 +578,12 @@ class install (Command): self.create_path_file() # write list of installed files, if requested. - if self.record or self.record_rpm: + if self.record: outputs = self.get_outputs() if self.root: # strip any package prefix root_len = len(self.root) for counter in xrange(len(outputs)): outputs[counter] = outputs[counter][root_len:] - if self.record_rpm: # add directories - self.record = self.record_rpm - dirs = [] - # directories to reject: - rejectdirs = [ - '/etc', - '/', - '', - self.prefix, - self.exec_prefix, - self.install_base, - self.install_platbase, - self.install_purelib, - self.install_platlib, - self.install_headers[:len(self.install_headers) - len(self.distribution.get_name()) - 1], - self.install_libbase, - self.install_scripts, - self.install_data, - os.path.join(self.install_data, 'share'), - os.path.join(self.install_data, 'share', 'doc'), - ] - # directories whose childs reject: - rejectdirs2 = [ - os.path.join(self.install_data, 'share', 'man'), - ] - # directories whose grandsons reject: - rejectdirs3 = [ - os.path.join(self.install_data, 'share', 'man'), - os.path.join(self.install_data, 'share', 'locale'), - ] - for counter in xrange(len(rejectdirs)): - if len(rejectdirs[counter]) > root_len: - rejectdirs[counter] = rejectdirs[counter][root_len:] - for counter in xrange(len(rejectdirs2)): - if len(rejectdirs2[counter]) > root_len: - rejectdirs2[counter] = rejectdirs2[counter][root_len:] - for counter in xrange(len(rejectdirs3)): - if len(rejectdirs3[counter]) > root_len: - rejectdirs3[counter] = rejectdirs3[counter][root_len:] - for counter in xrange(len(outputs)): - directory = os.path.dirname(outputs[counter]) - while directory not in rejectdirs and \ - os.path.dirname(directory) not in rejectdirs2 and \ - os.path.dirname(os.path.dirname(directory)) not in rejectdirs3: - dirname = '%dir ' + directory - if dirname not in dirs: - dirs.append(dirname) - directory = os.path.dirname(directory) - outputs += dirs self.execute(write_file, (self.record, outputs), "writing list of installed files to '%s'" % |