Add --exclude /packages/ to the rsync line for the snapshot

diff --git a/ChangeLog b/ChangeLog
index 6e71c06fc320f9fef60df09301a45432da2db2af..20712efde7337689ca884be750279c5a324706a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Sep 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/target/snapshot.py:
+  Add --exclude /packages/ to the rsync line for the snapshot
+
   13 Sep 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/target/generic_stage.py, modules/catalyst/util.py:
   Create catalyst.util.move() helper and use it

diff --git a/modules/catalyst/target/snapshot.py b/modules/catalyst/target/snapshot.py
index cbee31fd04e233bf94502a34b5080bad45fbaca9..0eb7a3fba1ff2b2d4d6ea8ef69fa05c00e32b89c 100644 (file)
--- a/modules/catalyst/target/snapshot.py
+++ b/modules/catalyst/target/snapshot.py
@@ -45,10 +45,10 @@ class snapshot_target(catalyst.target.generic.generic_target):
                        os.makedirs(mytmp)
 
                catalyst.util.rsync(self.settings["portdir"] + "/", mytmp + "/portage/", delete=True, \
-                       extra_opts="--exclude /distfiles/ --exclude /local/ --exclude CVS/ --exclude .svn --filter=H_**/files/digest-*")
+                       extra_opts="--exclude /distfiles/ --exclude /local/ --exclude /packages/ --exclude CVS/ --exclude .svn --filter=H_**/files/digest-*")
 
                msg("Compressing Portage snapshot tarball...")
-               catalyst.util.create_tarball(self.settings["snapshot_path"], "portage", mytmp)
+               catalyst.util.create_tarball(self.settings["snapshot_path"], "portage", working_dir=mytmp)
 
                catalyst.hash.gen_contents_file(self.settings["snapshot_path"], self.settings)
                catalyst.hash.gen_digest_file(self.settings["snapshot_path"], self.settings)