fix for bug #76146

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

diff --git a/ChangeLog b/ChangeLog
index 3607e6e682c1be8eb94db899ee3701c44d0844d7..75f4c129d5cdb53d73406cf34f353de6d9d6ca63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.139 2005/01/05 20:18:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.140 2005/01/10 01:05:59 zhen Exp $
+
+  09 Jan 2005; John Davis <zhen@gentoo.org> modules/generic_stage_target.py,
+  modules/livecd_stage2_target.py:
+  fix for bug #76146
 
   05 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript-support/livecdfs-update.sh, targets/stage1/stage1.sh:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index ed3cc3938378be340765d9a58faaf899266f0902..7d1ebbbab6dd66c93317daf5ea56107eca15032a 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.22 2005/01/04 23:54:59 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.23 2005/01/10 01:05:59 zhen Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -245,7 +245,7 @@ class generic_stage_target(generic_target):
                if self.settings.has_key("portage_confdir"):
                        print "Configuring /etc/portage..."
                        cmd("rm -rf "+self.settings["chroot_path"]+"/etc/portage","Error zapping /etc/portage")
-                       cmd("cp -R "+self.settings["portage_confdir"]+" "+self.settings["chroot_path"]+\
+                       cmd("cp -R "+self.settings["portage_confdir"]+"/ "+self.settings["chroot_path"]+\
                                "/etc/portage","Error copying /etc/portage")
 
                for x in self.mounts: 

diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py
index 1ab89736ff080b9c66e1b9e3d3332e6f4e30e2d9..5c1ac3bc51618de737d2ce6333637684e15a1784 100644 (file)
--- a/modules/livecd_stage2_target.py
+++ b/modules/livecd_stage2_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.28 2005/01/04 23:54:59 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.29 2005/01/10 01:05:59 zhen Exp $
 
 """
 Builder class for a LiveCD stage2 build.
@@ -73,7 +73,7 @@ class livecd_stage2_target(generic_stage_target):
                if self.settings.has_key("portage_confdir"):
                        print "Configuring /etc/portage..."
                        cmd("rm -rf "+self.settings["chroot_path"]+"/etc/portage","Error zapping /etc/portage")
-                       cmd("cp -R "+self.settings["portage_confdir"]+" "+self.settings["chroot_path"]+\
+                       cmd("cp -R "+self.settings["portage_confdir"]+"/ "+self.settings["chroot_path"]+\
                                "/etc/portage","Error copying /etc/portage")
 
                for x in self.mounts: