back out temporary workaround b=414966 r=nthomas

This commit is contained in:
rhelmer@mozilla.com 2008-02-04 13:08:23 -08:00
Родитель a2693af82b
Коммит a782b543c2
1 изменённых файлов: 5 добавлений и 6 удалений

Просмотреть файл

@ -6,7 +6,6 @@ package Bootstrap::Step::Tag;
use Cwd; use Cwd;
use File::Copy qw(move); use File::Copy qw(move);
use POSIX qw(strftime); use POSIX qw(strftime);
eval "use Date::Manip";
use MozBuild::Util qw(MkdirWithPath RunShellCommand); use MozBuild::Util qw(MkdirWithPath RunShellCommand);
use Bootstrap::Util qw(CvsCatfile); use Bootstrap::Util qw(CvsCatfile);
@ -187,11 +186,11 @@ sub Execute {
} }
# relBranchDateSpec now has something like: "2006/12/05 19:12:58" # relBranchDateSpec now has something like: "2006/12/05 19:12:58"
# convert to local timezone my $relBranchDateSpec = $cvsDateSpec;
my $relBranchDateSpec = ParseDate($cvsDateSpec); # Strip off the time...
$relBranchDateSpec = Date_ConvTZ($relBranchDateSpec,'UTC'); $relBranchDateSpec =~ s/^\s*([\d\/]+).*/$1/;
$relBranchDateSpec = UnixDate($relBranchDateSpec, '%Y%m%d'); # Strip out the /'s; now we have our datespec: 20061205
# now we have our datespec: 20061205 $relBranchDateSpec =~ s/\///g;
$geckoTag = $this->GenerateRelbranchName(milestone => $milestone, $geckoTag = $this->GenerateRelbranchName(milestone => $milestone,
datespec => $relBranchDateSpec); datespec => $relBranchDateSpec);