Append slashes to directories so rsyncs work properly

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

diff --git a/ChangeLog b/ChangeLog
index d6ed9dc434fae0213978fd306b2493df2ee9de15..4ff21a2cce73b275b0b3340079e5e0281ec6eaad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.332 2005/09/13 15:39:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.333 2005/09/15 14:31:58 rocket Exp $
+
+  15 Sep 2005; Eric Edgar <rocket@gentoo.org>
+  modules/livecd_stage2_target.py:
+  Append slashes to directories so rsyncs work properly
 
   13 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   examples/livecd-stage2_template.spec:

diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py
index 57085b091f0b62078345287d75101df18dbb3b34..0939945d8e18b800442ee2fedcc4a5c35376ac75 100644 (file)
--- a/modules/livecd_stage2_target.py
+++ b/modules/livecd_stage2_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.48 2005/09/12 18:49:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.49 2005/09/15 14:31:58 rocket Exp $
 
 """
 Builder class for a LiveCD stage2 build.
@@ -38,7 +38,7 @@ class livecd_stage2_target(generic_stage_target):
            if os.path.isfile(self.settings["source_path"]):
                self.settings["source_path_md5sum"]=calc_md5(self.settings["source_path"])
            else:
-               self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"])
+               self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/")
                if not os.path.exists(self.settings["source_path"]):
                    raise CatalystError,"Source Path: "+self.settings["source_path"]+" does not exist."
        
@@ -46,7 +46,7 @@ class livecd_stage2_target(generic_stage_target):
            self.settings["spec_prefix"]="livecd"
 
        def set_target_path(self):
-               self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
+               self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/")
                if self.settings.has_key("AUTORESUME") \
                        and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"):
                                print "Resume point detected, skipping target path setup operation..."