Browse Source

Use fetch-url instead of wget in local generator, making it possible to

use file:// URLs.

r59241
tags/0.42
Colin Watson 12 years ago
parent
commit
4afed37dab
3 changed files with 4 additions and 8 deletions
  1. +2
    -0
      debian/changelog
  2. +1
    -1
      debian/control
  3. +1
    -7
      generators/60local

+ 2
- 0
debian/changelog View File

@@ -11,6 +11,8 @@ apt-setup (1:0.42) UNRELEASED; urgency=low
(LP: #181776).
* Adjust cancellation comment in apt-setup-verify: in-target preserves
exit codes as of debian-installer-utils 1.70.
* Use fetch-url instead of wget in local generator, making it possible to
use file:// URLs.

-- Colin Watson <cjwatson@debian.org> Wed, 24 Jun 2009 17:48:57 +0100



+ 1
- 1
debian/control View File

@@ -11,7 +11,7 @@ XC-Package-Type: udeb
Architecture: all
Priority: standard
XB-Installer-Menu-Item: 7000
Depends: apt-mirror-setup, installed-base, ${misc:Depends}
Depends: apt-mirror-setup, installed-base, di-utils (>= 1.58), ${misc:Depends}
Description: Configure apt

Package: apt-mirror-setup


+ 1
- 7
generators/60local View File

@@ -31,14 +31,8 @@ while db_get "apt-setup/local$i/repository" && [ "$RET" ]; do
echo "deb-src $repository" >> $file
fi
if [ -n "$key" ]; then
# make wget use the proxy
protocol=${repository%%:*}
if db_get mirror/$protocol/proxy && [ "$RET" ]; then
proxy="$RET"
eval "export ${protocol}_proxy=$proxy"
fi
# fetch the key
wget "$key" -O "$ROOT/tmp/key$i.pub"
fetch-url "$key" "$ROOT/tmp/key$i.pub"
# add it to the keyring
$chroot $ROOT apt-key add "/tmp/key$i.pub"
rm -f "$ROOT/tmp/key$i.pub"


Loading…
Cancel
Save