Browse Source

* apt-setup-verify: reset IFS to avoid problems with option processing.

r44616
tags/0.17
Frans Pop 14 years ago
parent
commit
3026c71dcc
2 changed files with 8 additions and 3 deletions
  1. +6
    -2
      apt-setup-verify
  2. +2
    -1
      debian/changelog

+ 6
- 2
apt-setup-verify View File

@@ -2,6 +2,9 @@
# verify and optionally save out the file
set -e

NL="
"

NOTEST=""
if [ "$1" = "--invalid" ]; then
NOTEST=1
@@ -46,11 +49,12 @@ valid () {
items=0
gooditems=0

IFS="
"
OLDIFS="$IFS"
IFS="$NL"
# Can't just iterate over $(cat $file) because that kills newlines, so
# introduce a dummy colon.
for line in $(sed 's/^/:/' $file); do
IFS="$OLDIFS"
line="${line#:}"
if expr "$line" : '.*[^ ].*' >/dev/null && [ "$(expr "$line" : "#")" != 1 ]; then
items=$(expr "$items" + 1)


+ 2
- 1
debian/changelog View File

@@ -13,8 +13,9 @@ apt-setup (1:0.17) UNRELEASED; urgency=low
* Reduce timeout for testing security mirrors to 30 seconds. As security.d.o
currently has 3 IP addresses listed, and these are tried consecutively, the
total timeout will be 1.5 minutes (was 6 minutes). Closes: #393033.
* apt-setup-verify: reset IFS to avoid problems with option processing.

-- Frans Pop <fjp@debian.org> Mon, 29 Jan 2007 11:18:34 +0100
-- Frans Pop <fjp@debian.org> Mon, 29 Jan 2007 14:00:34 +0100

apt-setup (1:0.16) unstable; urgency=low



Loading…
Cancel
Save