Allow override of Proxy-Auto-Detect by the users configuration

[apt.git] / vendor / getinfo

diff --git a/vendor/getinfo b/vendor/getinfo
index 861fd3d17da4e1880df52978e46ebde7ace1ed4b..d45c0fca2b085000585e8168674cc74193466103 100755 (executable)
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -3,6 +3,7 @@
 
 BASEDIR="$(readlink -f "$(dirname $0)")"
 INFO="$(readlink -f "${BASEDIR}/current/apt-vendor.ent")"
 
 BASEDIR="$(readlink -f "$(dirname $0)")"
 INFO="$(readlink -f "${BASEDIR}/current/apt-vendor.ent")"

+VERBATIM="${BASEDIR}/../doc/apt-verbatim.ent"

 
 if [ -z "$INFO" ] || [ ! -e "$INFO" ]; then
        echo >&2 'The current vendor is not valid or not chosen by the buildsystem yet.'
 
 if [ -z "$INFO" ] || [ ! -e "$INFO" ]; then
        echo >&2 'The current vendor is not valid or not chosen by the buildsystem yet.'


@@ -20,14 +21,20 @@ getfield() {
 }
 
 case "$1" in
 }
 
 case "$1" in

-debian-stable-codename)
-       getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
+debian-stable-codename|debian-oldstable-codename|debian-testing-codename)
+       getrawfield "${1#*-}" "$VERBATIM"

        ;;
 ubuntu-codename)
        ;;
 ubuntu-codename)

-       getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
+       getrawfield "$1" "$VERBATIM"

        ;;
        ;;

-keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-distro-codename)
-       getfield "$1"
+keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-codename)
+       exec $0 'vendor' "$@"
+       ;;
+vendor)
+       getfield "$2"
+       ;;
+verbatim)
+       getfield "$2" "$VERBATIM"

        ;;
 *)
        echo >&2 "Unknown data field $1 requested"
        ;;
 *)
        echo >&2 "Unknown data field $1 requested"