From 0d91a43826fa92e300a1241df3240c1c1e8d29b3 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Thu, 21 Jun 2018 19:21:44 -0400
Subject: .debootstrap/trisquel: Unset KEYRING before setting

debootstrap's keyring() only sets KEYRING if it is unset or empty.

Script downloaded and modified with:

    wget -O - https://devel.trisquel.info/trisquel/package-helpers/raw/flidas/helpers/DATA/debootstrap/trisquel | sed 's/^keyring .*$/unset KEYRING; keyring "${SCRIPT}-archive-keyring.gpg"/' >.debootstrap/trisquel
---
diff --git a/.debootstrap/trisquel b/.debootstrap/trisquel
index cb23824..4726d6d 100644
--- a/.debootstrap/trisquel
+++ b/.debootstrap/trisquel
@@ -10,7 +10,7 @@ mirror_style release
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase
-keyring "${SCRIPT}-archive-keyring.gpg"
+unset KEYRING; keyring "${SCRIPT}-archive-keyring.gpg"
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
--
cgit v0.9.1