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

* fix rename_configs() indent error

Browse Source 
* make upgrade config code human readable.
This commit is contained in:
Faik Uygur
2006-08-29 12:38:26 +00:00
parent 2f98945588
commit 9acba90ebb
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/atomicoperations.py
+15 -15
View File
@@ -279,8 +279,8 @@ class Install(AtomicOperation):
oldconfig = path + '.old' oldconfig = path + '.old'
if os.path.exists(newconfig): if os.path.exists(newconfig):
os.unlink(newconfig) os.unlink(newconfig)
os.rename(path, newconfig) os.rename(path, newconfig)
os.rename(oldconfig, path) os.rename(oldconfig, path)
# remove left over files from the old package. # remove left over files from the old package.
def clean_leftovers(): def clean_leftovers():
@@ -294,23 +294,23 @@ class Install(AtomicOperation):
Remove.remove_file( old_fileinfo[path] ) Remove.remove_file( old_fileinfo[path] )
if self.reinstall: if self.reinstall:
new = set(map(lambda x: str(x.path), self.files.list)) # get 'config' typed file objects
old = set(map(lambda x: str(x.path), self.old_files.list)) new = filter(lambda x: x.type == 'config', self.files.list)
old = filter(lambda x: x.type == 'config', self.old_files.list)
# handle special cases for upgrades # get config path lists
overlap = old & new newconfig = set(map(lambda x: str(x.path), new))
self.files.list.sort(key=lambda x:x.path) oldconfig = set(map(lambda x: str(x.path), old))
self.old_files.list.sort(key=lambda x:x.path)
def get_upgrades(list): config_overlaps = newconfig & oldconfig
return filter(lambda x : str(x.path) in overlap, list) if config_overlaps:
(upgrade_new, upgrade_old) = map(get_upgrades, [self.files.list, self.old_files.list]) files = filter(lambda x: x.path in config_overlaps, old)
for newf, oldf in zip(upgrade_new, upgrade_old): for file in files:
assert newf.path == oldf.path check_config_changed(file)
if newf.type == 'config' and oldf.type == 'config': # config upgrade
check_config_changed(oldf)
else: else:
for file in self.files.list: for file in self.files.list:
if file.type == 'config': 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())