Stop dropping /etc/portage from the stages and update its contents from portage_confdir.

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 7a5d0a0aecde1e8e3b045ec86de9972908b3f44f..5c15609fff75afbaec6b2e436ed9a6db3adea1a1 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -830,10 +830,8 @@ class generic_stage_target(generic_target):
                else:
                        if self.settings.has_key("portage_confdir"):
                                print "Configuring /etc/portage..."
-                               cmd("rm -rf "+self.settings["chroot_path"]+"/etc/portage",\
-                                       "Error zapping /etc/portage",env=self.env)
-                               cmd("cp -R "+self.settings["portage_confdir"]+"/ "+\
-                                       self.settings["chroot_path"]+"/etc/portage",\
+                               cmd("rsync -a "+self.settings["portage_confdir"]+"/ "+\
+                                       self.settings["chroot_path"]+"/etc/portage/",\
                                        "Error copying /etc/portage",env=self.env)
                                touch(self.settings["autoresume_path"]+"setup_confdir")