summaryrefslogtreecommitdiffstats
path: root/anaconda
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2008-10-29 13:04:15 +0100
committerHans de Goede <hdegoede@redhat.com>2008-10-29 13:04:15 +0100
commit465e38c4d42ab1d9e8cf753b28b14b715268adc0 (patch)
tree2aa6640247b5c1d3a77f0118f27934d53402344d /anaconda
parent3eef673658452c5f420967e5562440838ad9367d (diff)
downloadanaconda-465e38c4d42ab1d9e8cf753b28b14b715268adc0.tar.gz
anaconda-465e38c4d42ab1d9e8cf753b28b14b715268adc0.tar.xz
anaconda-465e38c4d42ab1d9e8cf753b28b14b715268adc0.zip
Fix various syntax errors caught by PyChecker
Fix various syntax errors caught by PyChecker
Diffstat (limited to 'anaconda')
-rwxr-xr-xanaconda6
1 files changed, 3 insertions, 3 deletions
diff --git a/anaconda b/anaconda
index 8612d37f8..44dd15ab3 100755
--- a/anaconda
+++ b/anaconda
@@ -259,7 +259,7 @@ def setVNCFromKickstart(opts):
try:
opts.ksfile = preprocessKickstart(opts.ksfile)
except KickstartError, msg:
- stdoutLog.critical(_("Error processing %%ksappend lines: %s") % e)
+ stdoutLog.critical(_("Error processing %%ksappend lines: %s") % msg)
sys.exit(1)
except Exception, e:
stdoutLog.critical(_("Unknown error processing %%ksappend lines: %s") % e)
@@ -305,7 +305,7 @@ def setRescueModeFromKickstart(opts):
try:
opts.ksfile = preprocessKickstart(opts.ksfile)
except KickstartError, msg:
- stdoutLog.critical(_("Error processing %%ksappend lines: %s") % e)
+ stdoutLog.critical(_("Error processing %%ksappend lines: %s") % msg)
sys.exit(1)
except Exception, e:
stdoutLog.critical(_("Unknown error processing %%ksappend lines: %s") % e)
@@ -840,7 +840,7 @@ if __name__ == "__main__":
os.environ["DISPLAY"] = ":1"
doStartupX11Actions(opts.runres)
xserver_pid = proc.pid
- except OSError, RuntimeError:
+ except (OSError, RuntimeError):
stdoutLog.warning(" X startup failed, falling back to text mode")
opts.display_mode = 't'
graphical_failed = 1