silence outdated build noise (bz1745745)

epel8
Tom Callaway 5 years ago
parent e4f20afdcc
commit 35b2732605

@ -0,0 +1,59 @@
From e79d9d0e06b825d2e62b38db03248c0e6ceec7e4 Mon Sep 17 00:00:00 2001
From: Greg Thompson <grt@chromium.org>
Date: Sat, 5 Oct 2019 03:47:05 +0000
Subject: [PATCH] Only detect outdated builds on Google Chrome.
Prior to https://crrev.com/643864, they weren't detected for Chromium on
account of the way google_brand worked. That CL changed behavior and
accidentally started showing the outdated build bubble for Linux
Chromium users.
BUG=1010592
Change-Id: I069ac36166e2ae720d58b1b9aa85605792be8684
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841635
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703131}
---
.../upgrade_detector/upgrade_detector_impl.cc | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
index 432e3789eced0..07850fdf80cd7 100644
--- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
@@ -31,6 +31,7 @@
#include "base/time/default_tick_clock.h"
#include "base/time/tick_clock.h"
#include "base/time/time.h"
+#include "build/branding_buildflags.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/google/google_brand.h"
#include "chrome/common/chrome_switches.h"
@@ -74,6 +75,14 @@ constexpr base::TimeDelta kNotifyCycleTimeForTesting =
// The number of days after which we identify a build/install as outdated.
constexpr base::TimeDelta kOutdatedBuildAge = base::TimeDelta::FromDays(12 * 7);
+constexpr bool ShouldDetectOutdatedBuilds() {
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ return true;
+#else // BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ return false;
+#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
+}
+
// Return the string that was passed as a value for the
// kCheckForUpdateIntervalSec switch.
std::string CmdLineInterval() {
@@ -403,6 +412,9 @@ bool UpgradeDetectorImpl::DetectOutdated
if (base::IsMachineExternallyManaged())
return false;
#endif
+
+ if (!ShouldDetectOutdatedBuilds())
+ return false;
}
base::Time network_time;

@ -162,7 +162,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel} Name: chromium%{chromium_channel}
%endif %endif
Version: %{majorversion}.0.3865.120 Version: %{majorversion}.0.3865.120
Release: 2%{?dist} Release: 3%{?dist}
Summary: A WebKit (Blink) powered web browser Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@ -223,6 +223,8 @@ Patch59: chromium-77.0.3865.75-gcc-abstract-class.patch
Patch60: chromium-77.0.3865.75-missing-limits.patch Patch60: chromium-77.0.3865.75-missing-limits.patch
# https://chromium.googlesource.com/chromium/src/+/74138b9febd37eac0fc26b8efb110014a83a52c6 # https://chromium.googlesource.com/chromium/src/+/74138b9febd37eac0fc26b8efb110014a83a52c6
Patch61: chromium-77.0.3865.90-linked-hash-set.patch Patch61: chromium-77.0.3865.90-linked-hash-set.patch
# https://chromium.googlesource.com/chromium/src/+/e79d9d0e06b825d2e62b38db03248c0e6ceec7e4
Patch62: chromium-77.0.3865.120-silence-outdated-build-noise.patch
# Use lstdc++ on EPEL7 only # Use lstdc++ on EPEL7 only
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
@ -748,6 +750,7 @@ udev.
%patch59 -p1 -b .gcc-abstract-class %patch59 -p1 -b .gcc-abstract-class
%patch60 -p1 -b .missing-limits %patch60 -p1 -b .missing-limits
%patch61 -p1 -b .linked-hash-set %patch61 -p1 -b .linked-hash-set
%patch62 -p1 -b .silence-outdated-build-noise
# Fedora branded user agent # Fedora branded user agent
%if 0%{?fedora} %if 0%{?fedora}
@ -1662,6 +1665,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog %changelog
* Wed Oct 16 2019 Tom Callaway <spot@fedoraproject.org> - 77.0.3865.120-3
- silence outdated build noise (bz1745745)
* Tue Oct 15 2019 Tom Callaway <spot@fedoraproject.org> - 77.0.3865.120-2 * Tue Oct 15 2019 Tom Callaway <spot@fedoraproject.org> - 77.0.3865.120-2
- fix node handling for EPEL-8 - fix node handling for EPEL-8

Loading…
Cancel
Save