From be9698af0eb8016a1a9813c7fae33347b5a6a6f6 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Fri, 14 Feb 2003 22:58:20 +0000 Subject: okay, forget trying to use convertdb1, it doesn't seem to work. just tell them to upgrade to the errata rpm. --- upgrade.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'upgrade.py') diff --git a/upgrade.py b/upgrade.py index 6dc5ad27c..02167db29 100644 --- a/upgrade.py +++ b/upgrade.py @@ -354,21 +354,15 @@ def upgradeFindPackages(intf, method, id, instPath, dir): # according to jbj if (os.access(instPath + "/var/lib/rpm/packages.rpm", os.R_OK) and not os.access(instPath + "/var/lib/rpm/Packages", os.R_OK)): - id.dbpath = "%s/var/lib/rpm-%s" %(instPath, rebuildTime) - shutil.copytree("%s/var/lib/rpm" %(instPath,), id.dbpath) + win.pop() + intf.messageWindow(_("Error"), + _("The installation program is unable to upgrade " + "systems with a pre-rpm 4.x database. " + "Please install the errata rpm packages " + "for your release as described in the release " + "notes and then run the upgrade procedure.")) + sys.exit(0) - args = [ "/usr/libexec/convertdb1", - "-r", instPath, "/var/lib/rpm/packages.rpm" ] - rc = iutil.execWithRedirect(args[0], args, - stdout = "/dev/tty5", - stderr = "/dev/tty5") - - if rc: - win.pop() - intf.messageWindow(_("Error"), - _("Rebuild of RPM database failed. " - "You may be out of disk space?")) - sys.exit(0) else: id.dbpath = None -- cgit