From: Chris Gianelloni Date: Sat, 2 Feb 2008 19:33:27 +0000 (+0000) Subject: Add .svn to the catalyst snapshot excludes and remove old pordir_overlay code. X-Git-Tag: CATALYST_2_0_6_916~225 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe190bc76ffd433f871d243fefaa4fcc94517694;p=catalyst.git 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 1000343d..9e37b654 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 02 Feb 2008; Chris Gianelloni + modules/snapshot_target.py: + Add .svn to the catalyst snapshot excludes and remove old pordir_overlay code. + 02 Feb 2008; Chris Gianelloni 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 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)