summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--packages.py5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ebb8bd0ff..2992ebc27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-07 Jeremy Katz <katzj@redhat.com>
+
+ * packages.py (rpmErrorClass.install_callback): Don't segfault
+ before removes, should fix upgrades.
+
2005-06-01 Chris Lumens <clumens@redhat.com>
* packages.py (doInstall): Fixed grammar problem (#159044).
diff --git a/packages.py b/packages.py
index f64b34de2..df3f56f05 100644
--- a/packages.py
+++ b/packages.py
@@ -876,6 +876,11 @@ def doInstall(method, id, intf, instPath):
for pkg in id.upgradeRemove:
ts.addErase(pkg)
+ # set the rpm log file to /dev/null to start with so we don't segfault
+ f = open("/dev/null", "w+")
+ rpm.setLogFile(f)
+ ts.scriptFd = f.fileno()
+
# if we hit problems, it's not like there's anything we can
# do about it
ts.run(install_callback, 0)