Try to fix upgrade problem that arise with glibc...

This commit is contained in:
Barış Metin
2006-07-07 00:20:38 +00:00
parent bfb610399f
commit 65a5ee7f60
+12 -9
View File
@@ -260,15 +260,6 @@ class Install(AtomicOperation):
config_changed = [] config_changed = []
if self.reinstall: if self.reinstall:
# remove left over files
new = set(map(lambda x: str(x.path), self.files.list))
old = set(map(lambda x: str(x.path), self.old_files.list))
leftover = old - new
old_fileinfo = {}
for fileinfo in self.old_files.list:
old_fileinfo[str(fileinfo.path)] = fileinfo
for path in leftover:
Remove.remove_file( old_fileinfo[path] )
# handle special cases for upgrades # handle special cases for upgrades
overlap = old & new overlap = old & new
@@ -313,6 +304,18 @@ class Install(AtomicOperation):
os.rename(path, path + '.newconfig') os.rename(path, path + '.newconfig')
os.rename(path + '.old', path) os.rename(path + '.old', path)
if self.reinstall:
# remove left over files
new = set(map(lambda x: str(x.path), self.files.list))
old = set(map(lambda x: str(x.path), self.old_files.list))
leftover = old - new
old_fileinfo = {}
for fileinfo in self.old_files.list:
old_fileinfo[str(fileinfo.path)] = fileinfo
for path in leftover:
Remove.remove_file( old_fileinfo[path] )
def store_pisi_files(self): def store_pisi_files(self):
"""put files.xml, metadata.xml, actions.py and COMAR scripts """put files.xml, metadata.xml, actions.py and COMAR scripts
somewhere in the file system. We'll need these in future...""" somewhere in the file system. We'll need these in future..."""