Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable removal of Google repo in Debian package #4291

Merged
merged 2 commits into from
Jan 2, 2020
Merged

Disable removal of Google repo in Debian package #4291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b991ad
Revert "Remove Chrome repo erroneously added by brave-browser (brave-…
fmarier Dec 31, 2019
8c58e4f
Disable removal of Google repo (fixes brave/brave-browser#6912)
fmarier Dec 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions patches/chrome-installer-linux-common-repo.cron.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
diff --git a/chrome/installer/linux/common/repo.cron b/chrome/installer/linux/common/repo.cron
index 2750e4924da6d0a723c1d649781637e7d08b3562..2b9a3f3591a93a033a93e201b2b1a1d13ebbecd4 100755
index 2750e4924da6d0a723c1d649781637e7d08b3562..fbe7797e37633de174f4a83d7b11bf04b8813c1a 100755
--- a/chrome/installer/linux/common/repo.cron
+++ b/chrome/installer/linux/common/repo.cron
@@ -17,6 +17,18 @@
@@ -17,6 +17,9 @@
# "false" as desired. An empty $DEFAULTS_FILE is the same as setting both values
# to "false".

+# Remove Chrome repo if erroneously added (brave/brave-browser#2927)
+if [ -e "/etc/apt/sources.list.d/@@PACKAGE@@.list" ] ; then
+ if [ ! -e "/etc/apt/sources.list.d/google-chrome.list" -a ! -e "/etc/apt/sources.list.d/google-chrome-beta.list" -a ! -e "/etc/apt/sources.list.d/google-chrome-unstable.list" ] ; then
+ apt-key del D38B4796
+ fi
+ rm -f "/etc/default/@@PACKAGE@@"
+ rm "/etc/apt/sources.list.d/@@PACKAGE@@.list"
+fi
+
+# Don't add the Chrome repo (brave/brave-browser#1084)
+exit 0
+
Expand Down
13 changes: 2 additions & 11 deletions patches/chrome-installer-linux-common-rpmrepo.cron.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
diff --git a/chrome/installer/linux/common/rpmrepo.cron b/chrome/installer/linux/common/rpmrepo.cron
index f7fe2bcf7d7cbf95b23067f21f87422706c5e4d0..3dbad7d3a412efb023f3d57707fe6723d5a78e66 100755
index f7fe2bcf7d7cbf95b23067f21f87422706c5e4d0..3541826a03009e2adb8dbd6c258d254d31247a77 100755
--- a/chrome/installer/linux/common/rpmrepo.cron
+++ b/chrome/installer/linux/common/rpmrepo.cron
@@ -14,6 +14,18 @@
@@ -14,6 +14,9 @@
# setting "repo_add_once" to "true" or "false" as desired. An empty
# $DEFAULTS_FILE is the same as setting the value to "false".

+# Remove Chrome repo if erroneously added (brave/brave-browser#2927)
+if [ -e "/etc/yum.repos.d/@@PACKAGE@@.repo" ] ; then
+ if [ ! -e "/etc/yum.repos.d/google-chrome.repo" -a ! -e "/etc/yum.repos.d/google-chrome-beta.repo" -a ! -e "/etc/yum.repos.d/google-chrome-unstable.repo" ] ; then
+ rpm -e gpg-pubkey-7fac5991-4615767f
+ rpm -e gpg-pubkey-d38b4796-570c8cd3
+ fi
+ rm "/etc/yum.repos.d/@@PACKAGE@@.repo"
+fi
+
+# Don't add the Chrome repo (brave/brave-browser#1967)
+exit 0
+
Expand Down
9 changes: 9 additions & 0 deletions patches/chrome-installer-linux-debian-postrm.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
diff --git a/chrome/installer/linux/debian/postrm b/chrome/installer/linux/debian/postrm
index 85b9961013ff276c13810d32ec8d927859abba37..542e1298f986d90579182ecdf2c870365190f349 100755
--- a/chrome/installer/linux/debian/postrm
+++ b/chrome/installer/linux/debian/postrm
@@ -30,4 +30,3 @@ if [ -s "$DEFAULTS_FILE" ]; then
rm "$DEFAULTS_FILE" || exit 1
fi
# Remove any Google repository added by the package.
-clean_sources_lists