summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2018-06-21 19:21:44 (EDT)
committer P. J. McDermott <pj@pehjota.net>2018-06-21 19:28:20 (EDT)
commit0d91a43826fa92e300a1241df3240c1c1e8d29b3 (patch)
tree600ca14a375b86bd441105b12cf23eb19abccd6e
parent09db87f4bb692e824a09f10b76df2e3a054b2de3 (diff)
downloadtrisquel-master.zip
trisquel-master.tar.gz
trisquel-master.tar.bz2
.debootstrap/trisquel: Unset KEYRING before settingHEADmaster
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
-rw-r--r--.debootstrap/trisquel2
1 files changed, 1 insertions, 1 deletions
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"