[PATCH] Move hdiso handling code to PackagePayload (#1180765)

David Shea dshea at redhat.com
Mon Jan 19 16:55:56 UTC 2015


This way the kickstart harddrive command can work outside of yum.
---
 pyanaconda/packaging/__init__.py   | 15 +++++++++++++++
 pyanaconda/packaging/yumpayload.py | 17 +----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py
index de85e80..64985ac 100644
--- a/pyanaconda/packaging/__init__.py
+++ b/pyanaconda/packaging/__init__.py
@@ -1001,6 +1001,21 @@ class PackagePayload(Payload):
                     self.requiredPackages.append(package)
         log.debug("required packages = %s", self.requiredPackages)
 
+    @property
+    def ISOImage(self):
+        """ The location of a mounted ISO repo, or None. """
+        if not self.data.method.method == "harddrive":
+            return None
+        # This could either be mounted to INSTALL_TREE or on
+        # DRACUT_ISODIR if dracut did the mount.
+        dev = blivet.util.get_mount_device(INSTALL_TREE)
+        if dev:
+            return dev[len(ISO_DIR)+1:]
+        dev = blivet.util.get_mount_device(DRACUT_ISODIR)
+        if dev:
+            return dev[len(DRACUT_ISODIR)+1:]
+        return None
+
     ###
     ### METHODS FOR WORKING WITH ENVIRONMENTS
     ###
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 5948349..742edad 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -63,8 +63,7 @@ except ImportError:
     log.error("import of yum failed")
     yum = None
 
-from pyanaconda.constants import BASE_REPO_NAME, DRACUT_ISODIR, INSTALL_TREE, ISO_DIR, MOUNT_DIR, \
-                                 LOGLVL_LOCK, IPMI_ABORTED
+from pyanaconda.constants import BASE_REPO_NAME, MOUNT_DIR, LOGLVL_LOCK, IPMI_ABORTED
 from pyanaconda.flags import flags
 
 from pyanaconda import iutil
@@ -651,20 +650,6 @@ reposdir=%s
 
         log.info("metadata retrieval complete")
 
-    @property
-    def ISOImage(self):
-        if not self.data.method.method == "harddrive":
-            return None
-        # This could either be mounted to INSTALL_TREE or on
-        # DRACUT_ISODIR if dracut did the mount.
-        dev = blivet.util.get_mount_device(INSTALL_TREE)
-        if dev:
-            return dev[len(ISO_DIR)+1:]
-        dev = blivet.util.get_mount_device(DRACUT_ISODIR)
-        if dev:
-            return dev[len(DRACUT_ISODIR)+1:]
-        return None
-
     @refresh_base_repo()
     def _configureAddOnRepo(self, repo):
         """ Configure a single ksdata repo. """
-- 
2.1.0



More information about the anaconda-patches mailing list