summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2020-02-10 10:32:51 +0100
committeranonym <anonym@riseup.net>2020-02-10 10:32:51 +0100
commitf572b22d2086a7a2a410de960f48a70808e6eccf (patch)
treeb91e5b444cdbd559d07856e816b691c9b1e46077
parented6d0a8ab305fc10fee62450ebc093bc73f4c808 (diff)
parentf1f2453b2611142a7c499026441a66e86f78a54b (diff)
Merge remote-tracking branch 'origin/bugfix/17458-buster-10.3+force-all-tests' into stable
Fix-committed: #17458
-rw-r--r--config/APT_snapshots.d/debian/serial2
-rw-r--r--config/chroot_apt/preferences4
l---------config/chroot_sources/buster-proposed-updates.binary1
-rw-r--r--config/chroot_sources/buster-proposed-updates.chroot1
4 files changed, 1 insertions, 7 deletions
diff --git a/config/APT_snapshots.d/debian/serial b/config/APT_snapshots.d/debian/serial
index edcac88..e23a8ab 100644
--- a/config/APT_snapshots.d/debian/serial
+++ b/config/APT_snapshots.d/debian/serial
@@ -1 +1 @@
-2020020302
+2020020902
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 837f517..9984cd5 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -96,10 +96,6 @@ Pin: release l=Debian-Security,n=buster/updates
Pin-Priority: 990
Package: *
-Pin: release o=Debian,n=buster-proposed-updates
-Pin-Priority: 990
-
-Package: *
Pin: release o=TorProject,n=buster
Pin-Priority: 990
diff --git a/config/chroot_sources/buster-proposed-updates.binary b/config/chroot_sources/buster-proposed-updates.binary
deleted file mode 120000
index d18191f..0000000
--- a/config/chroot_sources/buster-proposed-updates.binary
+++ /dev/null
@@ -1 +0,0 @@
-buster-proposed-updates.chroot \ No newline at end of file
diff --git a/config/chroot_sources/buster-proposed-updates.chroot b/config/chroot_sources/buster-proposed-updates.chroot
deleted file mode 100644
index 2d09613..0000000
--- a/config/chroot_sources/buster-proposed-updates.chroot
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ftp.us.debian.org/debian/ buster-proposed-updates main contrib non-free