* on second thought, these are the same!!

This commit is contained in:
Faik Uygur
2006-08-29 12:51:00 +00:00
parent 9acba90ebb
commit 2641e21cc9
+5 -18
View File
@@ -293,24 +293,11 @@ class Install(AtomicOperation):
for path in leftover: for path in leftover:
Remove.remove_file( old_fileinfo[path] ) Remove.remove_file( old_fileinfo[path] )
if self.reinstall: # You either upgrade/downgrade or install a new package, controls are same.
# get 'config' typed file objects # If a 'config' typed file coming from the package and the same file
new = filter(lambda x: x.type == 'config', self.files.list) # already exists on the system, it is either a left over from a previously
old = filter(lambda x: x.type == 'config', self.old_files.list) # uninstalled package or it is upgraded package's currently used config file.
for file in filter(lambda x: x.type == 'config', self.files.list):
# get config path lists
newconfig = set(map(lambda x: str(x.path), new))
oldconfig = set(map(lambda x: str(x.path), old))
config_overlaps = newconfig & oldconfig
if config_overlaps:
files = filter(lambda x: x.path in config_overlaps, old)
for file in files:
check_config_changed(file)
else:
for file in self.files.list:
if file.type == 'config':
# there may be left over config files
check_config_changed(file) check_config_changed(file)
self.package.extract_install(ctx.config.dest_dir()) self.package.extract_install(ctx.config.dest_dir())