зеркало из https://github.com/mozilla/pjs.git
Backing out my change to avoid pulling by date on branches, my assertion that this didn't work was incorrect. thanks to cls for figuring this out.
This commit is contained in:
Родитель
874b32a20a
Коммит
677cd08ce0
|
@ -18,7 +18,7 @@ use POSIX qw(sys_wait_h strftime);
|
|||
use Cwd;
|
||||
use File::Basename; # for basename();
|
||||
use Config; # for $Config{sig_name} and $Config{sig_num}
|
||||
$::UtilsVersion = '$Revision: 1.69 $ ';
|
||||
$::UtilsVersion = '$Revision: 1.70 $ ';
|
||||
|
||||
package TinderUtils;
|
||||
|
||||
|
@ -578,21 +578,17 @@ sub BuildIt {
|
|||
$ENV{MOZILLA_FIVE_HOME} = "$binary_dir";
|
||||
|
||||
my $cvsco = '';
|
||||
# Tack on pull by date if requested. Don't pull by date on a branch,
|
||||
# cvs currently only supports one tag, either a date tag or a branch tag,
|
||||
# we will assume branch tag wins for now.
|
||||
if ((not defined($Settings::BuildTag)) or $Settings::BuildTag eq '') {
|
||||
if ($Settings::UseTimeStamp) {
|
||||
|
||||
# Note: Pull-by-date works on a branch, but cvs stat won't show
|
||||
# you this. Thanks to cls for figuring this out.
|
||||
if ($Settings::UseTimeStamp) {
|
||||
$start_time = adjust_start_time($start_time);
|
||||
my $time_str = POSIX::strftime("%m/%d/%Y %H:%M", localtime($start_time));
|
||||
$ENV{MOZ_CO_DATE} = "$time_str";
|
||||
$cvsco = "$Settings::CVSCO -D '$time_str'";
|
||||
} else {
|
||||
} else {
|
||||
$cvsco = "$Settings::CVSCO -A";
|
||||
}
|
||||
} else {
|
||||
$cvsco = "$Settings::CVSCO";
|
||||
}
|
||||
}
|
||||
|
||||
mail_build_started_message($start_time) if $Settings::ReportStatus;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче