diff --git a/mozilla/tools/release/Bootstrap/Step/Tag.pm b/mozilla/tools/release/Bootstrap/Step/Tag.pm index f6676e41ed0..a6e638de353 100644 --- a/mozilla/tools/release/Bootstrap/Step/Tag.pm +++ b/mozilla/tools/release/Bootstrap/Step/Tag.pm @@ -8,7 +8,7 @@ use File::Copy qw(move); use POSIX qw(strftime); use MozBuild::Util qw(MkdirWithPath RunShellCommand); -use Bootstrap::Util qw(CvsCatfile GetDiffFileList); +use Bootstrap::Util qw(CvsCatfile); use Bootstrap::Step; use Bootstrap::Step::Tag::Bump; diff --git a/mozilla/tools/release/Bootstrap/Step/Tag/Mozilla.pm b/mozilla/tools/release/Bootstrap/Step/Tag/Mozilla.pm index ea438628bc2..5eb5aae5f8c 100644 --- a/mozilla/tools/release/Bootstrap/Step/Tag/Mozilla.pm +++ b/mozilla/tools/release/Bootstrap/Step/Tag/Mozilla.pm @@ -7,6 +7,7 @@ use File::Copy qw(move); use File::Spec::Functions; use MozBuild::Util qw(MkdirWithPath); +use Bootstrap::Util qw(GetDiffFileList); use Bootstrap::Config; use Bootstrap::Step::Tag; @@ -47,11 +48,10 @@ sub Execute { if ($rc > 1) { my $previousRcTag = $productTag . '_RC' . ($rc - 1); - my $diffFileList = $this->GetDiffFileList(cvsDir => - catfile($cvsrootTagDir, - 'mozilla'), - prevTag => $previousRcTag, - newTag => $rcTag); + my $diffFileList = GetDiffFileList(cvsDir => catfile($cvsrootTagDir, + 'mozilla'), + prevTag => $previousRcTag, + newTag => $rcTag); if (scalar(@{$diffFileList}) > 0) { $this->CvsTag( diff --git a/mozilla/tools/release/Bootstrap/Step/Tag/l10n.pm b/mozilla/tools/release/Bootstrap/Step/Tag/l10n.pm index 811e2488b66..434cc5d25f6 100644 --- a/mozilla/tools/release/Bootstrap/Step/Tag/l10n.pm +++ b/mozilla/tools/release/Bootstrap/Step/Tag/l10n.pm @@ -12,7 +12,7 @@ use MozBuild::Util qw(MkdirWithPath); use Bootstrap::Step; use Bootstrap::Config; use Bootstrap::Step::Tag; -use Bootstrap::Util qw(CvsCatfile); +use Bootstrap::Util qw(CvsCatfile GetDiffFileList); use strict; @@ -119,10 +119,10 @@ sub Execute { # If we're retagging rc(N > 1), we need to tag -F if ($rc > 1) { my $previousRcTag = $productTag . '_RC' . ($rc - 1); - my $diffFileList = $this->GetDiffFileList(cvsDir => catfile($l10nTagDir, - 'l10n'), - prevTag => $previousRcTag, - newTag => $rcTag); + my $diffFileList = GetDiffFileList(cvsDir => catfile($l10nTagDir, + 'l10n'), + prevTag => $previousRcTag, + newTag => $rcTag); if (scalar(@{$diffFileList}) > 0) { $releaseTagArgs{'force'} = 1; diff --git a/mozilla/tools/release/Bootstrap/Util.pm b/mozilla/tools/release/Bootstrap/Util.pm index 13db7a8efaf..0a211f24866 100644 --- a/mozilla/tools/release/Bootstrap/Util.pm +++ b/mozilla/tools/release/Bootstrap/Util.pm @@ -237,7 +237,7 @@ sub GetDiffFileList { my $newTag = $args{'newTag'}; my $rv = RunShellCommand(command => 'cvs', - args => ['diff', '-uN', + args => ['-q', 'diff', '-uN', '-r', $firstTag, '-r', $newTag], dir => $cvsDir,