* fix: remove pisi files of old package in the right place

previously, we've been worrying too much with faik :)
This commit is contained in:
Eray Özkural
2006-02-14 23:52:42 +00:00
parent a4caf94096
commit 6a8b2d43f0
+7 -7
View File
@@ -244,6 +244,9 @@ class Install(AtomicOperation):
"""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..."""
if self.reinstall:
util.clean_dir(self.old_path)
ctx.ui.info(_('Storing %s, ') % ctx.const.files_xml) ctx.ui.info(_('Storing %s, ') % ctx.const.files_xml)
self.package.extract_file(ctx.const.files_xml, self.package.pkg_dir()) self.package.extract_file(ctx.const.files_xml, self.package.pkg_dir())
@@ -270,8 +273,6 @@ class Install(AtomicOperation):
"update databases" "update databases"
if self.reinstall: if self.reinstall:
Remove(self.metadata.package.name).remove_db(txn) Remove(self.metadata.package.name).remove_db(txn)
if not self.same_ver:
Remove.remove_pisi_files(self.old_path)
# installdb # installdb
ctx.installdb.install(self.metadata.package.name, ctx.installdb.install(self.metadata.package.name,
@@ -364,7 +365,7 @@ class Remove(AtomicOperation):
txn.abort() txn.abort()
raise e raise e
self.remove_pisi_files(self.package.pkg_dir()) self.remove_pisi_files()
ctx.ui.status() ctx.ui.status()
ctx.ui.notify(pisi.ui.removed, package = self.package, files = self.files) ctx.ui.notify(pisi.ui.removed, package = self.package, files = self.files)
@@ -407,9 +408,8 @@ class Remove(AtomicOperation):
pass pass
@staticmethod @staticmethod
def remove_pisi_files(path): def remove_pisi_files():
#TODO: what does this have to do with pisi files?? util.clean_dir(self.package.pkg_dir())
util.clean_dir(path)
def remove_db(self, txn): def remove_db(self, txn):
ctx.installdb.remove(self.package_name, txn) ctx.installdb.remove(self.package_name, txn)
@@ -443,7 +443,7 @@ def virtual_install(metadata, files, txn):
"""Recreate the package info for rebuilddb command""" """Recreate the package info for rebuilddb command"""
pkg = metadata.package pkg = metadata.package
# normally this can't be true. Just for backward compatibility # normally this can't be true. Just for backwards compatibility
# TODO: for speed only ctx.installdb.install exception can be # TODO: for speed only ctx.installdb.install exception can be
# handled but this is much cleaner # handled but this is much cleaner
if ctx.installdb.is_installed(pkg.name, txn): if ctx.installdb.is_installed(pkg.name, txn):