From d5e06cb5cae17d5f8b6ce1954e35443b2c7a7df3 Mon Sep 17 00:00:00 2001
From: Junichi Uekawa <dancer@netfort.gr.jp>
Date: Mon, 5 Jul 2010 22:18:05 +0900
Subject: Add an option to verify key signatures. (closes: #579028)

By unsetting APTGETOPT, and setting
PBUILDERSATISFYDEPENDSOPT=('--check-key'), the user now has an option
of verifying the key signature of each package against the installed
keyring.
---
 examples/B90lintian                    | 2 +-
 examples/B91debc                       | 2 +-
 examples/B91dpkg-i                     | 4 ++--
 examples/B92test-pkg                   | 4 ++--
 examples/C10shell                      | 2 +-
 examples/C11screen                     | 2 +-
 examples/execute_installtest.sh        | 2 +-
 examples/pbuilder-test/000_prepinstall | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'examples')

diff --git a/examples/B90lintian b/examples/B90lintian
index f2c692f..83f39c3 100644
--- a/examples/B90lintian
+++ b/examples/B90lintian
@@ -3,7 +3,7 @@
 set -e
 
 install_packages() {
-    apt-get -y --force-yes install "$@"
+    apt-get -y "${APTGETOPT[@]}" install "$@"
 }
 
 install_packages lintian
diff --git a/examples/B91debc b/examples/B91debc
index b52620f..98c6a47 100644
--- a/examples/B91debc
+++ b/examples/B91debc
@@ -3,7 +3,7 @@
 #
 # 343894: a script to run debc command, contributed from q-funk.
 
-apt-get install -y --force-yes devscripts
+apt-get install -y "${APTGETOPT[@]}" devscripts
 cd /tmp/buildd/*/debian
 cd ..
 debc
diff --git a/examples/B91dpkg-i b/examples/B91dpkg-i
index ee031bb..00f2561 100644
--- a/examples/B91dpkg-i
+++ b/examples/B91dpkg-i
@@ -18,11 +18,11 @@ dpkg -i /tmp/buildd/*.deb
 dpkg --purge $PKGNAMES
 
 # upgrade-remove check
-apt-get install -y --force-yes  $PKGNAMES || true
+apt-get install -y "${APTGETOPT[@]}"  $PKGNAMES || true
 dpkg -i /tmp/buildd/*.deb
 dpkg --remove $PKGNAMES
 
 # upgrade-purge check
-apt-get install -y --force-yes $PKGNAMES || true
+apt-get install -y "${APTGETOPT[@]}" $PKGNAMES || true
 dpkg -i /tmp/buildd/*.deb
 dpkg --purge $PKGNAMES
diff --git a/examples/B92test-pkg b/examples/B92test-pkg
index 1325e50..53703f4 100644
--- a/examples/B92test-pkg
+++ b/examples/B92test-pkg
@@ -10,13 +10,13 @@ set -e
 echo "Installing the prerequisites"
 # ignore the failures since they are not the prime interest
 for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do
-    apt-get install -y --force-yes "$PKG" || true 
+    apt-get install -y "${APTGETOPT[@]}" "$PKG" || true 
     apt-get remove -y "$PKG" || true 
 done
 
 # install the single package, then try to satisfy dependencies.
 dpkg -i /tmp/buildd/*.deb || true
-apt-get install -y -f --force-yes
+apt-get install -y -f "${APTGETOPT[@]}"
 
 if chmod a+x /tmp/buildd/*/debian/pbuilder-test/*; then
     :
diff --git a/examples/C10shell b/examples/C10shell
index 0a13d10..017cb0e 100644
--- a/examples/C10shell
+++ b/examples/C10shell
@@ -2,6 +2,6 @@
 # example file to be used with --hookdir
 #
 # invoke shell if build fails.
-apt-get install -y --force-yes vim less 
+apt-get install -y "${APTGETOPT[@]}" vim less 
 cd /tmp/buildd/*/debian/..
 /bin/bash < /dev/tty > /dev/tty 2> /dev/tty
diff --git a/examples/C11screen b/examples/C11screen
index 45f8a66..9b1d30f 100755
--- a/examples/C11screen
+++ b/examples/C11screen
@@ -4,6 +4,6 @@
 # invoke GNU screen if build fails.
 
 export debian_chroot="pbuilder"
-apt-get install -y --force-yes screen vim less
+apt-get install -y "${APTGETOPT[@]}" screen vim less
 cd /tmp/buildd/*/debian/..
 screen </dev/tty > /dev/tty 2> /dev/tty
diff --git a/examples/execute_installtest.sh b/examples/execute_installtest.sh
index 13f14f0..2e903a7 100755
--- a/examples/execute_installtest.sh
+++ b/examples/execute_installtest.sh
@@ -17,7 +17,7 @@ INSTALLTESTPID=$$
 ( sleep 1h ; kill $INSTALLTESTPID ) &
 KILLPID=$!
 
-apt-get install -y --force-yes "$@" < /dev/null
+apt-get install -y "${APTGETOPT[@]}" "$@" < /dev/null
 
 kill $KILLPID
 
diff --git a/examples/pbuilder-test/000_prepinstall b/examples/pbuilder-test/000_prepinstall
index 493bc59..24c4016 100644
--- a/examples/pbuilder-test/000_prepinstall
+++ b/examples/pbuilder-test/000_prepinstall
@@ -3,7 +3,7 @@
 # prepare environment for further testing.
 
 apt-get update
-apt-get -y --force-yes install binfmtc sudo
+apt-get -y "${APTGETOPT[@]}" install binfmtc sudo
 
 
 # add users if required.
-- 
cgit v1.2.3