[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cobbler-devel
Subject:    [PATCH 2/2] Correct improper distro creation while importing i386
From:       jlaska () redhat ! com (James Laska)
Date:       2009-11-17 14:11:44
Message-ID: 1258467104-4204-3-git-send-email-jlaska () redhat ! com
[Download RAW message or body]

---
 cobbler/action_import.py |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cobbler/action_import.py b/cobbler/action_import.py
index 642726e..660ce93 100644
--- a/cobbler/action_import.py
+++ b/cobbler/action_import.py
@@ -526,7 +526,7 @@ class Importer:
 
        for x in fnames:
 
-           adtl = None
+           adtls = []
 
            fullname = os.path.join(dirname,x)
            if os.path.islink(fullname) and os.path.isdir(fullname):
@@ -551,15 +551,17 @@ class Importer:
 
            # if we've collected a matching kernel and initrd pair, turn the in and add them to the list
            if initrd is not None and kernel is not None and dirname.find("isolinux") == -1:
-               adtl = self.add_entry(dirname,kernel,initrd)
+               adtls.append(self.add_entry(dirname,kernel,initrd))
+               kernel = None
+               initrd = None
            elif pae_initrd is not None and pae_kernel is not None and dirname.find("isolinux") == -1:
-               adtl = self.add_entry(dirname,pae_kernel,pae_initrd)
-           if adtl != None:
+               adtls.append(self.add_entry(dirname,pae_kernel,pae_initrd))
+               pae_kernel = None
+               pae_initrd = None
+           for adtl in adtls:
                distros_added.extend(adtl)
-               initrd = None
-               kernel = None
-               
-   
+
+
    # ========================================================================
 
    def add_entry(self,dirname,kernel,initrd):
-- 
1.6.5.2


[prev in list] [next in list] [prev in thread] [next in thread]