Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* No, we can not combine these.. revert 9099

Browse Source
This commit is contained in:
Faik Uygur
2006-09-13 18:55:40 +00:00
parent 7066c5450c
commit cbbb3b73a8
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/atomicoperations.py
+18 -5
View File
@@ -297,11 +297,24 @@ class Install(AtomicOperation):
for path in leftover: for path in leftover:
Remove.remove_file( old_fileinfo[path] ) Remove.remove_file( old_fileinfo[path] )
# You either upgrade/downgrade or install a new package, controls are same. if self.reinstall:
# If a 'config' typed file coming from the package and the same file # get 'config' typed file objects
# already exists on the system, it is either a left over from a previously new = filter(lambda x: x.type == 'config', self.files.list)
# uninstalled package or it is upgraded package's currently used config file. old = filter(lambda x: x.type == 'config', self.old_files.list)
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())