diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-28 00:31:01 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-28 00:31:01 +0100 |
| commit | 35ac30ee373c5ed84d7c2c5a701ac2d54963504d (patch) | |
| tree | 59da7e2385b396052c4f53ac187d520c00d2790c /vendor/getinfo | |
| parent | e5c2b7e8a5455e1dc6993ef9e151b3845fb53c60 (diff) | |
| parent | c035b6552ba4bd1c6fba5fd8f8d829c2efbefe3c (diff) | |
Merge branch 'debian/sid' into bugfix/bts731738-fancy-progess
Conflicts:
apt-pkg/install-progress.cc
Diffstat (limited to 'vendor/getinfo')
| -rwxr-xr-x | vendor/getinfo | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/getinfo b/vendor/getinfo index ac816e10e..861fd3d17 100755 --- a/vendor/getinfo +++ b/vendor/getinfo @@ -24,9 +24,9 @@ debian-stable-codename) getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" ;; ubuntu-codename) - getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" + getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent" ;; -keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri) +keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-distro-codename) getfield "$1" ;; *) |