diff options
author | Colin Watson <cjwatson@debian.org> | 2010-04-26 23:38:48 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-04-26 23:38:48 +0100 |
commit | 0d721c63cd02fc75df8579f76344ed63dd27b5f3 (patch) | |
tree | 1ea6f88bdf4184f83ee0995b1b9be5614fac4097 /debian | |
parent | 60698e569a6130a26b9433fac80fa9266b796362 (diff) |
Discard error messages while checking whether rsh, rlogin, and rcp
alternatives exist (closes: #579285).
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/openssh-client.postinst | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ffc232489..ec6547a36 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,10 @@ | |||
1 | openssh (1:5.5p1-3) UNRELEASED; urgency=low | ||
2 | |||
3 | * Discard error messages while checking whether rsh, rlogin, and rcp | ||
4 | alternatives exist (closes: #579285). | ||
5 | |||
6 | -- Colin Watson <cjwatson@debian.org> Mon, 26 Apr 2010 23:37:41 +0100 | ||
7 | |||
1 | openssh (1:5.5p1-2) unstable; urgency=low | 8 | openssh (1:5.5p1-2) unstable; urgency=low |
2 | 9 | ||
3 | * Use dh_installinit -n, since our maintainer scripts already handle this | 10 | * Use dh_installinit -n, since our maintainer scripts already handle this |
diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst index 3e33aeb82..cff282d70 100644 --- a/debian/openssh-client.postinst +++ b/debian/openssh-client.postinst | |||
@@ -42,7 +42,7 @@ create_alternatives() { | |||
42 | update-alternatives --quiet --remove rcp /usr/bin/ssh | 42 | update-alternatives --quiet --remove rcp /usr/bin/ssh |
43 | for cmd in rsh rlogin rcp; do | 43 | for cmd in rsh rlogin rcp; do |
44 | scmd="s${cmd#r}" | 44 | scmd="s${cmd#r}" |
45 | if ! update-alternatives --display "$cmd" | \ | 45 | if ! update-alternatives --display "$cmd" 2>/dev/null | \ |
46 | grep -q "$scmd"; then | 46 | grep -q "$scmd"; then |
47 | update-alternatives --quiet --install "/usr/bin/$cmd" "$cmd" "/usr/bin/$scmd" 20 \ | 47 | update-alternatives --quiet --install "/usr/bin/$cmd" "$cmd" "/usr/bin/$scmd" 20 \ |
48 | --slave "/usr/share/man/man1/$cmd.1.gz" "$cmd.1.gz" "/usr/share/man/man1/$scmd.1.gz" | 48 | --slave "/usr/share/man/man1/$cmd.1.gz" "$cmd.1.gz" "/usr/share/man/man1/$scmd.1.gz" |