From 1acb4ce7582abc39bd2502bbe57245b0bba59303 Mon Sep 17 00:00:00 2001
From: "rhelmer@mozilla.com" <rhelmer@mozilla.com>
Date: Mon, 22 Oct 2007 17:36:50 -0700
Subject: [PATCH] sync data dir correctly, and also sync after Stage step
 completes b=396438 r=rhelmer p=joduinn

---
 tools/release/Bootstrap/Step/Stage.pm | 4 +++-
 tools/release/Bootstrap/Util.pm       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/release/Bootstrap/Step/Stage.pm b/tools/release/Bootstrap/Step/Stage.pm
index 5a76a8cf565d..0f5ef8003558 100644
--- a/tools/release/Bootstrap/Step/Stage.pm
+++ b/tools/release/Bootstrap/Step/Stage.pm
@@ -13,7 +13,7 @@ use Cwd;
 
 use Bootstrap::Step;
 use Bootstrap::Config;
-use Bootstrap::Util qw(CvsCatfile);
+use Bootstrap::Util qw(CvsCatfile SyncToStaging);
 
 use MozBuild::Util qw(MkdirWithPath);
 
@@ -414,8 +414,10 @@ sub Execute {
     }
 
     $this->GroomFiles(catfile($batch1Dir, 'mar'));
+    SyncToStaging();
 }
 
+
 sub Verify {
     my $this = shift;
 
diff --git a/tools/release/Bootstrap/Util.pm b/tools/release/Bootstrap/Util.pm
index b46b12986957..3bb6c7ab0b50 100644
--- a/tools/release/Bootstrap/Util.pm
+++ b/tools/release/Bootstrap/Util.pm
@@ -321,7 +321,7 @@ sub SyncToStaging {
         die "ASSERT: SyncToStaging(): rsync failed\n";
     }
 
-    $dirName = CvsCatfile($stageHome, $product.'-'.$version);
+    $dirName = CvsCatfile($stageHome, $product.'-'.$version.'/');
 
     @cmdArgs = ($stagingUser . '@' . $stagingServer,
                    'rsync', '-av', $dirName,