diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-01 16:13:28 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-01 16:13:28 +0000 |
| commit | 7ef96224b8f697b74089ab8f47688f28e5025b42 (patch) | |
| tree | bdc54c06468d5b5f7e17e637144e5082fc1c4746 | |
| parent | 4481fc8e8fa5227c08271e4fa95eae78e6531800 (diff) | |
* fix the breakage from my last commit (note to self: always, _always_ run baz diff before a commit)
| -rwxr-xr-x | cmdline/apt-key | 6 | ||||
| -rw-r--r-- | debian/apt.postinst | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index be2b19a1a..0685e36f7 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" -ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the ubuntu-keyring package installed?" + echo >&2 "Is the debian-keyring package installed?" exit 1 fi diff --git a/debian/apt.postinst b/debian/apt.postinst index df0433057..ae1801198 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi ;; |