From e3c16f8d7138a94c7dfb2cabe3af19a3232cb485 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Thu, 24 Jan 2008 14:20:51 +0000 Subject: [PATCH] old_version -> old_pkginfo historydb will need an object with version, release and build members --- pisi/atomicoperations.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index f85b23c0..61e8cbc0 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -188,6 +188,7 @@ class Install(AtomicOperation): def check_reinstall(self): "check reinstall, confirm action, and schedule reinstall" + self.old_pkginfo = None pkg = self.pkginfo self.reinstall = False @@ -242,7 +243,7 @@ class Install(AtomicOperation): # schedule for reinstall 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.reinstall = True self.remove_old = Remove(pkg.name) @@ -254,9 +255,8 @@ class Install(AtomicOperation): import pisi.comariface try: if self.upgrade: - (iversion, irelease, ibuild) = self.old_version - fromVersion = iversion - fromRelease = irelease + fromVersion = self.old_pkginfo.version + fromRelease = self.old_pkginfo.release else: fromVersion = None fromRelease = None