Re: [PATCH storage]: More syntax errors / traceback fixes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hans de Goede wrote:
---
 installclasses/fedora.py |    3 +++
 storage/__init__.py      |   10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)
Looks good to me.


diff --git a/installclasses/fedora.py b/installclasses/fedora.py
index bfd9a55..087e2d3 100644
--- a/installclasses/fedora.py
+++ b/installclasses/fedora.py
@@ -79,6 +79,9 @@ class InstallClass(BaseInstallClass):
             return yuminstall.YumBackend

     def productMatches(self, oldprod):
+        if oldprod is None:
+            return False
+
         if oldprod.startswith(productName):
             return True

diff --git a/storage/__init__.py b/storage/__init__.py
index 06a9213..2775824 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -963,7 +963,7 @@ class BlkidTab(object):

 class CryptTab(object):
""" Dictionary-like interface to crypttab entries with map name keys """
-    def __init__(self, devicetree, blkidTab=None):
+    def __init__(self, devicetree, blkidTab=None, chroot=""):
         self.devicetree = devicetree
         self.blkidTab = blkidTab
         self.chroot = chroot
@@ -1117,7 +1117,7 @@ class FSSet(object):
             log.info("error parsing blkid.tab: %s" % e)
             blkidTab = None

-        cryptTab = CryptTab(self.devicetree, blkidTab=blkidTab)
+ cryptTab = CryptTab(self.devicetree, blkidTab=blkidTab, chroot=chroot)
         try:
             cryptTab.parse(chroot=chroot)
             log.debug("crypttab maps: %s" % cryptTab.mappings.keys())
@@ -1472,17 +1472,17 @@ class FSSet(object):
     def write(self, instPath):
""" write out all config files based on the set of filesystems """
         # /etc/fstab
-        fstab_path = os.normpath("%s/etc/fstab" % instPath)
+        fstab_path = os.path.normpath("%s/etc/fstab" % instPath)
         fstab = self.fstab()
         open(fstab_path, "w").write(fstab)

         # /etc/crypttab
-        crypttab_path = os.normpath("%s/etc/crypttab" % instPath)
+        crypttab_path = os.path.normpath("%s/etc/crypttab" % instPath)
         crypttab = self.crypttab()
         open(crypttab_path, "w").write(crypttab)

         # /etc/mdadm.conf
-        mdadm_path = os.normpath("%s/etc/mdadm.conf" % instPath)
+        mdadm_path = os.path.normpath("%s/etc/mdadm.conf" % instPath)
         mdadm_conf = self.mdadmConf()
         open(mdadm_path, "w").write(mdadm_conf)


_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux