summaryrefslogtreecommitdiffstats
path: root/pyanaconda/packaging
diff options
context:
space:
mode:
authorBrian C. Lane <bcl@redhat.com>2012-12-20 11:17:27 -0800
committerBrian C. Lane <bcl@redhat.com>2012-12-20 14:44:41 -0800
commit7aba97384639f20d06baad5e56c73c6395b5ee00 (patch)
tree2d750c8848fe8c8e45cd62e612abc7e0b548d6c2 /pyanaconda/packaging
parentf7090c24b7fdf84e66b23c5bf284c0eed7c6cbd3 (diff)
downloadanaconda-7aba97384639f20d06baad5e56c73c6395b5ee00.tar.gz
anaconda-7aba97384639f20d06baad5e56c73c6395b5ee00.tar.xz
anaconda-7aba97384639f20d06baad5e56c73c6395b5ee00.zip
fixup nfs repo install code (#879187)
Searching for an empty string inside of another string always returns True. It wasn't properly detecting whether dracut had setup the nfs repo.
Diffstat (limited to 'pyanaconda/packaging')
-rw-r--r--pyanaconda/packaging/yumpayload.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index a657e32ea..5a6ee6163 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -608,7 +608,7 @@ reposdir=%s
options, host, path = iutil.parseNfsUrl('nfs:%s' % isodev)
# See if the dir holding the iso is what we want
# and also if we have an iso mounted to /run/install/repo
- if path in isodev and DRACUT_ISODIR in device:
+ if path and path in isodev and DRACUT_ISODIR in device:
# Everything should be setup
url = "file://" + DRACUT_REPODIR
else:
@@ -616,7 +616,7 @@ reposdir=%s
needmount = True
if device:
options, host, path = iutil.parseNfsUrl('nfs:%s' % device)
- if path in device:
+ if path and path in device:
needmount = False
path = DRACUT_REPODIR
if needmount: