summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2007-03-07 16:33:32 +0000
committerJeremy Katz <katzj@redhat.com>2007-03-07 16:33:32 +0000
commit8d6d690fd2a12e233858befeaf5b0adaf1e31339 (patch)
tree9bf6a0824c7fe888cf8e84edf1b324593be759c8
parent820113e9146ce3208b72f7bbdb336df6ea17c48c (diff)
downloadanaconda-8d6d690fd2a12e233858befeaf5b0adaf1e31339.tar.gz
anaconda-8d6d690fd2a12e233858befeaf5b0adaf1e31339.tar.xz
anaconda-8d6d690fd2a12e233858befeaf5b0adaf1e31339.zip
2007-03-07 Jeremy Katz <katzj@redhat.com>
* backend.py (AnacondaBackend.initLog): Don't open the install log twice (Elliot Peele) * installclass.py (availableClasses): Log a warning when there's an error loading an installclass; raise it in debug mode (Elliot Peele) * exception.py: rpm import not used (Elliot Peele)
-rw-r--r--ChangeLog8
-rw-r--r--backend.py12
-rw-r--r--exception.py1
-rw-r--r--installclass.py4
4 files changed, 11 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index e2be4d7fc..ec9db53c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2007-03-07 Jeremy Katz <katzj@redhat.com>
+ * backend.py (AnacondaBackend.initLog): Don't open the install log
+ twice (Elliot Peele)
+
+ * installclass.py (availableClasses): Log a warning when there's
+ an error loading an installclass; raise it in debug mode (Elliot Peele)
+
+ * exception.py: rpm import not used (Elliot Peele)
+
* po/Makefile ($(NLSPACKAGE).pot): Specify that we're starting
from UTF-8 to make xgettext happy
diff --git a/backend.py b/backend.py
index d0c4f42d2..181c0dc3d 100644
--- a/backend.py
+++ b/backend.py
@@ -148,18 +148,6 @@ class AnacondaBackend:
pass
instLog = open(instLogName, "w+")
- if upgrade:
- logname = '/root/upgrade.log'
- else:
- logname = '/root/install.log'
-
- instLogName = instPath + logname
- try:
- shutil.rmtree (instLogName)
- except OSError:
- pass
-
- self.instLog = open(instLogName, "w+")
# dont start syslogd if we arent creating filesystems
if flags.setupFilesystems:
diff --git a/exception.py b/exception.py
index e9eb23b59..df08fbe3e 100644
--- a/exception.py
+++ b/exception.py
@@ -22,7 +22,6 @@ import signal
import traceback
import iutil
import types
-import rpm
import bdb
import rhpl
import time
diff --git a/installclass.py b/installclass.py
index d10ba3640..00846732f 100644
--- a/installclass.py
+++ b/installclass.py
@@ -527,7 +527,9 @@ def availableClasses(showHidden=0):
if obj.hidden == 0 or showHidden == 1:
list.append(((obj.name, obj, obj.pixmap), sortOrder))
except:
- pass
+ log.warning ("module import of %s failed: %s" % (mainName, sys.exc_type))
+ if flags.debug: raise
+ else: continue
list.sort(ordering)
for (item, priority) in list: