summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-05-31 14:27:13 +0000
committerChris Lumens <clumens@redhat.com>2007-05-31 14:27:13 +0000
commit361b99680e39dfec465adfaaac3ca90d9a573cca (patch)
tree904e9025d9b901f1bb9ca074aa8d4cf7b1ed15d5
parent11ade3eca3a628e2bf3fb800c26e50abc0e3db37 (diff)
downloadanaconda-361b99680e39dfec465adfaaac3ca90d9a573cca.tar.gz
anaconda-361b99680e39dfec465adfaaac3ca90d9a573cca.tar.xz
anaconda-361b99680e39dfec465adfaaac3ca90d9a573cca.zip
Don't traceback if we're unable to remove the script after running it
(#241878).
-rw-r--r--ChangeLog5
-rw-r--r--kickstart.py5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 07a2c7a33..bad735238 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-31 Chris Lumens <clumens@redhat.com>
+
+ * kickstart.py (AnacondaKSScript.run): Don't traceback if we're
+ unable to remove the script after running it (#241878).
+
2007-05-30 Chris Lumens <clumens@redhat.com>
* instdata.py (InstallData.write): Use shlex instead of a simple
diff --git a/kickstart.py b/kickstart.py
index c2f7ef3fd..47087188c 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -81,7 +81,10 @@ class AnacondaKSScript(Script):
"system.") % (messages,))
sys.exit(0)
- os.unlink(path)
+ try:
+ os.unlink(path)
+ except:
+ pass
if serial or self.logfile is not None:
os.chmod("%s" % messages, 0600)