bug 613511: new tagging and l10n scripts are calling clobberer.py wro…

…ng. r=catlee
mozilla · Nov 19, 2010 · 2f44b36 · 2f44b36
1 parent 6d68eed
commit 2f44b36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/scripts/l10n/release_repacks.sh b/scripts/l10n/release_repacks.sh
@@ -19,7 +19,7 @@ branchConfig=$2
 chunks=$3
 thisChunk=$4
 
-branch=$($JSONTOOL -k properties.branch $PROPERTIES_FILE)
+branch=$(basename $($JSONTOOL -k properties.branch $PROPERTIES_FILE))
 builder=$($JSONTOOL -k properties.buildername $PROPERTIES_FILE)
 builddir=$($JSONTOOL -k properties.builddir $PROPERTIES_FILE)
 slavename=$($JSONTOOL -k properties.slavename $PROPERTIES_FILE)

diff --git a/scripts/release/tagging.sh b/scripts/release/tagging.sh
@@ -8,7 +8,8 @@ workdir=`pwd`
 
 releaseConfig=$($JSONTOOL -k properties.release_config $PROPERTIES_FILE)
 releaseTag=$($JSONTOOL -k sourcestamp.revision $PROPERTIES_FILE)
-branch=$($JSONTOOL -k properties.branch $PROPERTIES_FILE)
+# Clobberer requires the short name of the branch
+branch=$(basename $($JSONTOOL -k properties.branch $PROPERTIES_FILE))
 builder=$($JSONTOOL -k properties.buildername $PROPERTIES_FILE)
 builddir=$($JSONTOOL -k properties.builddir $PROPERTIES_FILE)
 slavename=$($JSONTOOL -k properties.slavename $PROPERTIES_FILE)