Add .svn to the catalyst snapshot excludes and remove old pordir_overlay code.

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

diff --git a/ChangeLog b/ChangeLog
index 1000343dbda94c4007951a303ac2656e293eca48..9e37b654ea14e4ad022eaa1bec6c30240504dd09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/snapshot_target.py:
+  Add .svn to the catalyst snapshot excludes and remove old pordir_overlay code.
+
   02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-chroot.sh:
   As much as I hate this, we're going to force baselayout to install first.

diff --git a/modules/snapshot_target.py b/modules/snapshot_target.py
index f4ad7380136b9dc9d5f1c22dc959eca99d4bd442..8717d720e18f64a8318fc3d280fb5ec2fbc6dbc6 100644 (file)
--- a/modules/snapshot_target.py
+++ b/modules/snapshot_target.py
@@ -44,15 +44,9 @@ class snapshot_target(generic_stage_target):
                if not os.path.exists(mytmp):
                        os.makedirs(mytmp)
                
-               cmd("rsync -a --delete --exclude /packages/ --exclude /distfiles/ --exclude /local/ --exclude CVS/ "+\
+               cmd("rsync -a --delete --exclude /packages/ --exclude /distfiles/ --exclude /local/ --exclude CVS/ --include .svn "+\
                        self.settings["portdir"]+"/ "+mytmp+"/portage/","Snapshot failure",env=self.env)
                
-               #if self.settings.has_key("portdir_overlay"):
-                       #print "Adding Portage overlay to the snapshot..."
-                       #cmd("rsync -a --exclude /packages/ --exclude /distfiles/ --exclude /local/ --exclude CVS/ "+\
-                       #       self.settings["portdir_overlay"]+"/ "+mytmp+"/portage/","Snapshot/ overlay addition failure",\
-                       #       env=self.env)
-                       
                print "Compressing Portage snapshot tarball..."
                cmd("tar cjf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\
                        "Snapshot creation failure",env=self.env)