fix crash when no kernel is defined. spacing issue

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1031 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 86205bd920b0ae026cc33a433d7815dfc96d1954..35db32c6976d5359c1c16fd015047e9dd549beab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.516 2006/01/18 14:00:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.517 2006/01/18 14:10:23 rocket Exp $
+
+  18 Jan 2006; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py:
+  fix crash when no kernel is defined.  spacing issue
 
   18 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst:
   This is 2.0_rc18.

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index befd82738f6ac3b89f626894439515a23ae5f40e..976f6cff7cdf4b501c2cc878d0dace0a9472c3cd 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.118 2006/01/17 22:45:51 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.119 2006/01/18 14:10:23 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -454,29 +454,29 @@ class generic_stage_target(generic_target):
                        else:
                                loopy=addlargs["boot/kernel"]
                            
-               for x in loopy:
-                       self.required_values.append("boot/kernel/"+x+"/sources")
-                       self.required_values.append("boot/kernel/"+x+"/config")
-                       self.valid_values.append("boot/kernel/"+x+"/aliases")
-                       self.valid_values.append("boot/kernel/"+x+"/extraversion")
-                       self.valid_values.append("boot/kernel/"+x+"/packages")
-                       self.valid_values.append("boot/kernel/"+x+"/use")
-                       self.valid_values.append("boot/kernel/"+x+"/gk_kernargs")
-                       self.valid_values.append("boot/kernel/"+x+"/gk_action")
-                       self.valid_values.append("boot/kernel/"+x+"/initramfs_overlay")
-                       self.valid_values.append("boot/kernel/"+x+"/softlevel")
-                       self.valid_values.append("boot/kernel/"+x+"/postconf")
-                       if addlargs.has_key("boot/kernel/"+x+"/postconf"):
-                               print "boot/kernel/"+x+"/postconf is deprecated"
-                               print "\tInternally moving these ebuilds to boot/kernel/"+x+"/packages"
-                               print "\tPlease move them to boot/kernel/"+x+"/packages in your specfile"
-                               if type(addlargs["boot/kernel/"+x+"/postconf"]) == types.StringType:
-                                       loop2=[addlargs["boot/kernel/"+x+"/postconf"]]
-                               else:
-                                       loop2=addlargs["boot/kernel/"+x+"/postconf"]
+                       for x in loopy:
+                               self.required_values.append("boot/kernel/"+x+"/sources")
+                               self.required_values.append("boot/kernel/"+x+"/config")
+                               self.valid_values.append("boot/kernel/"+x+"/aliases")
+                               self.valid_values.append("boot/kernel/"+x+"/extraversion")
+                               self.valid_values.append("boot/kernel/"+x+"/packages")
+                               self.valid_values.append("boot/kernel/"+x+"/use")
+                               self.valid_values.append("boot/kernel/"+x+"/gk_kernargs")
+                               self.valid_values.append("boot/kernel/"+x+"/gk_action")
+                               self.valid_values.append("boot/kernel/"+x+"/initramfs_overlay")
+                               self.valid_values.append("boot/kernel/"+x+"/softlevel")
+                               self.valid_values.append("boot/kernel/"+x+"/postconf")
+                               if addlargs.has_key("boot/kernel/"+x+"/postconf"):
+                                       print "boot/kernel/"+x+"/postconf is deprecated"
+                                       print "\tInternally moving these ebuilds to boot/kernel/"+x+"/packages"
+                                       print "\tPlease move them to boot/kernel/"+x+"/packages in your specfile"
+                                       if type(addlargs["boot/kernel/"+x+"/postconf"]) == types.StringType:
+                                               loop2=[addlargs["boot/kernel/"+x+"/postconf"]]
+                                       else:
+                                               loop2=addlargs["boot/kernel/"+x+"/postconf"]
                                
-                               for y in loop2:
-                                       addlargs["boot/kernel/"+x+"/packages"].append(y)
+                                       for y in loop2:
+                                               addlargs["boot/kernel/"+x+"/packages"].append(y)
 
        def set_build_kernel_vars(self):
            if self.settings.has_key(self.settings["spec_prefix"]+"/devmanager"):