summaryrefslogtreecommitdiffstats
path: root/isys
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2007-05-04 20:18:42 +0000
committerChris Lumens <clumens@redhat.com>2008-08-06 11:35:59 -0400
commit8bc6b6d38f0e4d0e27f46d0b17e7c1e3f0d34561 (patch)
tree5e66831fca657a7c5d15e92c58c9b789eccce3f5 /isys
parentc87a634289ebeaeba54cd9d41ce9f11eaefe5c08 (diff)
downloadanaconda-8bc6b6d38f0e4d0e27f46d0b17e7c1e3f0d34561.tar.gz
anaconda-8bc6b6d38f0e4d0e27f46d0b17e7c1e3f0d34561.tar.xz
anaconda-8bc6b6d38f0e4d0e27f46d0b17e7c1e3f0d34561.zip
Don't traceback when trying to remove /mnt/sysimage (#227650).
* isys/isys.py (umount): Don't traceback when trying to remove the /mnt/sysimage tree because we may have /var/lib/rpm data in there already. Occurs when users start a new install and then decide to cancel it and proceed with an upgrade (#227650).
Diffstat (limited to 'isys')
-rwxr-xr-xisys/isys.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/isys/isys.py b/isys/isys.py
index 7214ec189..db8c3e2f0 100755
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -358,7 +358,10 @@ def umount(what, removeDir = 1):
rc = _isys.umount(what)
if removeDir and os.path.isdir(what):
- os.rmdir(what)
+ try:
+ os.rmdir(what)
+ except:
+ pass
if not rc and mountCount.has_key(what):
del mountCount[what]