diff options
| author | Colin Watson <cjwatson@debian.org> | 2004-07-10 12:53:05 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2004-07-10 12:53:05 +0000 |
| commit | 7b867673a637c0887889c89760a8f56949c287e3 (patch) | |
| tree | 531237bd527b07d7a62693ba3c262c86cdf43ae5 /contrib | |
| parent | 47baf070161032fc38041646ecccb8b929ed860a (diff) | |
Apply upstream bits of the patch for #258517.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ssh-copy-id | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index a1c0a9234..1555b5d37 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id | |||
| @@ -24,7 +24,7 @@ else | |||
| 24 | fi | 24 | fi |
| 25 | fi | 25 | fi |
| 26 | 26 | ||
| 27 | if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then | 27 | if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then |
| 28 | GET_ID="cat ${ID_FILE}" | 28 | GET_ID="cat ${ID_FILE}" |
| 29 | fi | 29 | fi |
| 30 | 30 | ||