[PATCH] Do not try to setup None NFS repository (#1028699)

Vratislav Podzimek vpodzime at redhat.com
Tue Nov 12 11:54:40 UTC 2013


Also clear method.method if updating base repo fails.

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/packaging/yumpayload.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index e077a49..f4da733 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -481,8 +481,6 @@ reposdir=%s
                         if repo.enabled:
                             self.disableRepo(repo.id)
 
-                return
-
             # this preserves the method details while disabling it
             self.data.method.method = None
             self.install_device = None
@@ -689,6 +687,8 @@ reposdir=%s
                         needmount = False
                         path = DRACUT_REPODIR
                 if needmount:
+                    if method.dir is None:
+                        raise PayloadError("NFS method missing directory/iso path")
                     # Mount the NFS share on INSTALL_TREE. If it ends up
                     # being nfsiso we will move the mountpoint to ISO_DIR.
                     if method.dir.endswith(".iso"):
-- 
1.8.4.2



More information about the anaconda-patches mailing list