Permalink
Browse files

merge

  • Loading branch information...
2 parents f98e5cb + 710f683 commit 20916d813733ed68f4b23c376a303b936b7a72a1 Mike Taylor committed Jan 21, 2011
Showing with 8 additions and 2 deletions.
  1. +6 −0 .hgtags
  2. +1 −1 scripts/release/push-to-mirrors.py
  3. +1 −1 scripts/release/push-to-mirrors.sh
View
@@ -257,3 +257,9 @@ c2764298ed909598d489e408d9c8c57ad3574fc7 FIREFOX_4_0b8_BUILD1
bdbb5846ece3232752fe3bb072acb38490d9d128 FIREFOX_4_0b8_RELEASE
e1b38c981a63e47555d206f665a5acf5016c54eb FIREFOX_4_0b9_BUILD1
10675f0c8471a394a5fe24733fa0800595aee51b FIREFOX_4_0b9_RELEASE
+434fcf8fa12ff24903c548834d19e327eeb2ef92 FIREFOX_3_6_14_RELEASE
+2eeef5c89a63480403cd4789774340df928de9df FIREFOX_3_6_14_BUILD1
+a2050f479a84eebf348206cf6f4e8720a4e5e8a3 FIREFOX_3_5_17_RELEASE
+434fcf8fa12ff24903c548834d19e327eeb2ef92 FIREFOX_3_5_17_RELEASE
+d1c7b7408fa6dc2b8074060c844576918a7b2ebb FIREFOX_3_5_17_BUILD1
+434fcf8fa12ff24903c548834d19e327eeb2ef92 FIREFOX_3_5_17_BUILD1
@@ -61,7 +61,7 @@ def checkStagePermissions(productName, version, buildNumber, stageServer,
tests = ["find %s ! -user ffxbld ! -path '*/contrib*'",
"find %s ! -group firefox ! -path '*/contrib*'",
"find %s -type f ! -perm 644",
- "find %s -mindepth 1 -type d ! -perm 755 ! -path '*/contrib*'",
+ "find %s -mindepth 1 -type d ! -perm 755 ! -path '*/contrib*' ! -path '*/partner-repacks*'",
"find %s -maxdepth 1 -type d ! -perm 2775 -path '*/contrib*'",
]
candidates_dir = makeCandidatesDir(productName, version, buildNumber)
@@ -37,7 +37,7 @@ $PYTHON $SCRIPTS_DIR/clobberer/clobberer.py -s build $CLOBBERER_URL $branch \
$builder $builddir $slavename $master
cd $SCRIPTS_DIR/../..
$PYTHON $SCRIPTS_DIR/buildfarm/maintenance/purge_builds.py \
- -s 0.3 -n info -n 'release-*' -n $builddir
+ -s 0.3 -n info -n 'rel-*' -n $builddir
cd $workdir
$PYTHON $MY_DIR/push-to-mirrors.py -c $branchConfig -r $releaseConfig \

0 comments on commit 20916d8

Please sign in to comment.