From 5dbdf82ca9ae7ec6f11348ee788a398340c79464 Mon Sep 17 00:00:00 2001
From: dancer <dancer>
Date: Sun, 4 Dec 2005 05:16:37 +0000
Subject: Revert to using --force-yes, since --allow-unauthenticated doesn't
 work with sarge   * Bug fix: "/usr/share/doc/pbuilder/examples/B90linda
 missing     --force-yes option", thanks to qfunk (Closes: #340715).     Note:
 --allow-unauthenticated is probably a better option here, but     apt-get in
 sarge does not support it, we will revisit it after etch.

---
 examples/B90linda               | 2 +-
 examples/B91dpkg-i              | 4 ++--
 examples/B92test-pkg            | 2 +-
 examples/execute_installtest.sh | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'examples')

diff --git a/examples/B90linda b/examples/B90linda
index a992a57..128d8f7 100644
--- a/examples/B90linda
+++ b/examples/B90linda
@@ -1,4 +1,4 @@
 #!/bin/bash
 # run linda on generated deb files
-apt-get install -y --allow-unauthenticated linda
+apt-get install -y --force-yes linda
 linda /tmp/buildd/*.deb
diff --git a/examples/B91dpkg-i b/examples/B91dpkg-i
index 63e5d11..ab7ebd7 100644
--- a/examples/B91dpkg-i
+++ b/examples/B91dpkg-i
@@ -16,11 +16,11 @@ dpkg -i /tmp/buildd/*.deb
 dpkg --purge $PKGNAMES
 
 # upgrade-remove check
-apt-get install -y --allow-unauthenticated  $PKGNAMES || true
+apt-get install -y --force-yes  $PKGNAMES || true
 dpkg -i /tmp/buildd/*.deb
 dpkg --remove $PKGNAMES
 
 # upgrade-purge check
-apt-get install -y --allow-unauthenticated $PKGNAMES || true
+apt-get install -y --force-yes $PKGNAMES || true
 dpkg -i /tmp/buildd/*.deb
 dpkg --purge $PKGNAMES
diff --git a/examples/B92test-pkg b/examples/B92test-pkg
index a678660..078e62f 100644
--- a/examples/B92test-pkg
+++ b/examples/B92test-pkg
@@ -5,7 +5,7 @@ set -e
 
 echo "Installing the prerequisites"
 for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do
-    apt-get install -y  --allow-unauthenticated "$PKG"
+    apt-get install -y --force-yes "$PKG"
     apt-get remove -y "$PKG"
 done
 
diff --git a/examples/execute_installtest.sh b/examples/execute_installtest.sh
index 35b72b9..8159b1a 100755
--- a/examples/execute_installtest.sh
+++ b/examples/execute_installtest.sh
@@ -19,7 +19,7 @@ INSTALLTESTPID=$$
 ( sleep 1h ; kill $INSTALLTESTPID ) &
 KILLPID=$!
 
-apt-get install  -y --allow-unauthenticated "$1" < /dev/null
+apt-get install -y --force-yes "$1" < /dev/null
 
 kill $KILLPID
 
-- 
cgit v1.2.3