old_version -> old_pkginfo

historydb will need an object with version, release and build members
This commit is contained in:
Faik Uygur
2008-01-24 14:20:51 +00:00
parent 424b7a670d
commit e3c16f8d71
+4 -4
View File
@@ -188,6 +188,7 @@ class Install(AtomicOperation):
def check_reinstall(self): def check_reinstall(self):
"check reinstall, confirm action, and schedule reinstall" "check reinstall, confirm action, and schedule reinstall"
self.old_pkginfo = None
pkg = self.pkginfo pkg = self.pkginfo
self.reinstall = False self.reinstall = False
@@ -242,7 +243,7 @@ class Install(AtomicOperation):
# schedule for reinstall # schedule for reinstall
self.old_files = self.installdb.get_files(pkg.name) self.old_files = self.installdb.get_files(pkg.name)
self.old_version = self.installdb.get_version(pkg.name) self.old_pkginfo = self.installdb.get_info(pkg.name)
self.old_path = self.installdb.pkg_dir(pkg.name, iversion, irelease) self.old_path = self.installdb.pkg_dir(pkg.name, iversion, irelease)
self.reinstall = True self.reinstall = True
self.remove_old = Remove(pkg.name) self.remove_old = Remove(pkg.name)
@@ -254,9 +255,8 @@ class Install(AtomicOperation):
import pisi.comariface import pisi.comariface
try: try:
if self.upgrade: if self.upgrade:
(iversion, irelease, ibuild) = self.old_version fromVersion = self.old_pkginfo.version
fromVersion = iversion fromRelease = self.old_pkginfo.release
fromRelease = irelease
else: else:
fromVersion = None fromVersion = None
fromRelease = None fromRelease = None