aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--modules/snapshot_target.py8
2 files changed, 5 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 1000343d..9e37b654 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
# $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.
This will keep us from having any issues with packages that don't respect
diff --git a/modules/snapshot_target.py b/modules/snapshot_target.py
index f4ad7380..8717d720 100644
--- 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)