Added a patch from Christian Heim <phreak@gentoo.org> to remove stale files, such...

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

diff --git a/ChangeLog b/ChangeLog
index 44b6d8652cfa6e849b03fa54d978712aa9ad53ce..2afc2c84ec333e346515b23ea4fcdbbdb649dc64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/generic_stage_target.py:
+  Added a patch from Christian Heim <phreak@gentoo.org> to remove stale files,
+  such as group- from /etc before creating our stage tarballs. This is for bug
+  #166695.
+
   06 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:
   Commenting out the livecd-kernel code, since the Installer should be doing

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 1ea286cbd27477d1cbf7606fce4639b0fa692c3e..8b0f6a1a6172b16be5706601f729108dfb824627 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -948,6 +948,10 @@ class generic_stage_target(generic_target):
                                cmd("rm -rf "+self.settings["chroot_path"]+"/usr/local/portage", "Could not remove /usr/local/portage",env=self.env)
                                cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+"/etc/make.conf", "Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
 
+                    # clean up old and obsoleted files in /etc
+                    if os.path.exists(self.settings["stage_path"]+"/etc"):
+                                cmd("find "+self.settings["stage_path"]+"/etc -maxdepth 1 -name \"*-\" | xargs rm -f", "Could not remove stray files in /etc",env=self.env)
+
                    if os.path.exists(self.settings["controller_file"]):
                        cmd("/bin/bash "+self.settings["controller_file"]+" clean","clean script failed.",env=self.env)
                        touch(self.settings["autoresume_path"]+"clean")