fix for failure when root_overlay is not set

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

diff --git a/ChangeLog b/ChangeLog
index f127b145b16726c8f8d89c13d289ba4b6fd66ca7..daf5813dae1afa8686110e15b07c812fa5d40de4 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.571 2006/02/14 00:04:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.572 2006/02/14 15:29:39 rocket Exp $
+
+  14 Feb 2006; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py:
+  fix for failure when root_overlay is not set
 
   14 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/bootloader-setup.sh:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 8ab529f40d585d1b1573adb0528ba2c520ae9541..dba0adf57ec313767cd586d30fc066fa7d3534e0 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.128 2006/02/10 23:01:21 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.129 2006/02/14 15:29:39 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -766,12 +766,12 @@ class generic_stage_target(generic_target):
        def root_overlay(self):
            # copy over the root_overlay
            # Always copy over the overlay incase it has changed
-               for x in self.settings[self.settings["spec_prefix"]+"/root_overlay"]: 
-                       if os.path.exists(x):
-                               if self.settings.has_key(self.settings["spec_prefix"]+"/root_overlay"):
+               if self.settings.has_key(self.settings["spec_prefix"]+"/root_overlay"):
+                       for x in self.settings[self.settings["spec_prefix"]+"/root_overlay"]: 
+                               if os.path.exists(x):
                                        print "Copying root_overlay: "+x
                                        cmd("rsync -a "+x+"/ "+\
-                                       self.settings["chroot_path"], self.settings["spec_prefix"]+"/root_overlay: "+x+" copy failed.",env=self.env)
+                                               self.settings["chroot_path"], self.settings["spec_prefix"]+"/root_overlay: "+x+" copy failed.",env=self.env)
 
        def bind(self):
                for x in self.mounts: