diff options
| author | Thorsten Glaser <tg@mirbsd.de> | 2012-03-10 02:23:53 +0000 |
|---|---|---|
| committer | Junichi Uekawa <dancer@netfort.gr.jp> | 2012-03-13 19:09:31 +0900 |
| commit | b19439139262531be817e0ff856ac9cd60057896 (patch) | |
| tree | c96a9e8c5fe612c753d2335aca75d3c4516d6d3a /pbuilder-satisfydepends-checkparams | |
| parent | e990894f68de3c31ef8371fcf4baa301cfe7144a (diff) | |
| download | pbuilder-b19439139262531be817e0ff856ac9cd60057896.tar pbuilder-b19439139262531be817e0ff856ac9cd60057896.tar.gz | |
Bug#663283: pbuilder: pbuilder-satisfydepends failed due to --check-key deprecation bug
Dixi quod…
>You should not deprecate an option so suddenly, either. I’m
Here’s a possible fix (untested).
From 4fce2898d1d2cf292243316dd9f74b7f5f253a3b Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 10 Mar 2012 02:22:10 +0000
Subject: [PATCH] make --check-key and --allow-untrusted into a toggle of each other
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
so that --check-key
A: does not error out (Closes: #663283)
B: is silently accepted
C: has the ability to un-do a previous --allow-untrusted
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Diffstat (limited to 'pbuilder-satisfydepends-checkparams')
| -rwxr-xr-x | pbuilder-satisfydepends-checkparams | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pbuilder-satisfydepends-checkparams b/pbuilder-satisfydepends-checkparams index b81c765..24a601f 100755 --- a/pbuilder-satisfydepends-checkparams +++ b/pbuilder-satisfydepends-checkparams @@ -26,6 +26,7 @@ BINARY_ARCH="no" FORCEVERSION="" CONTINUE_FAIL="no" CHROOTEXEC_AFTER_INTERNAL_CHROOTEXEC=no +ALLOWUNTRUSTED=no while [ -n "$1" ]; do case "$1" in @@ -73,16 +74,11 @@ while [ -n "$1" ]; do shift; ;; --check-key) - log 'W: --check-key is now enabled by default and thus deprecated.' + ALLOWUNTRUSTED=no shift; ;; --allow-untrusted) - # Also duplicated in pbuilder-checkparams! - # apt flag to accept untrusted packages - APTGETOPT[${#APTGETOPT[@]}]='--force-yes' - # aptitude flag to accept untrusted packages - APTITUDEOPT[${#APTITUDEOPT[@]}]='-o' - APTITUDEOPT[${#APTITUDEOPT[@]}]='Aptitude::CmdLine::Ignore-Trust-Violations=true' + ALLOWUNTRUSTED=yes shift; ;; --help|-h|*) @@ -92,4 +88,13 @@ while [ -n "$1" ]; do esac done +if [ $ALLOWUNTRUSTED = yes ]; then + # Also duplicated in pbuilder-checkparams! + # apt flag to accept untrusted packages + APTGETOPT[${#APTGETOPT[@]}]='--force-yes' + # aptitude flag to accept untrusted packages + APTITUDEOPT[${#APTITUDEOPT[@]}]='-o' + APTITUDEOPT[${#APTITUDEOPT[@]}]='Aptitude::CmdLine::Ignore-Trust-Violations=true' +fi + checkbuilddep_internal |