scp metachar escaping fixes: remove duplicate '&' (always there), escape '!' (broken in r1082)

contrib/ssh

@@ -82,7 +82,7 @@ _scp()
 		# add space at end of file names
 		COMPREPLY=( $( ssh -o 'Batchmode yes' $userhost \
 			       command ls -aF1d "$path*" 2>/dev/null | \
-			       sed -e "s/[][(){}<>\",:;^&!$&=?\`|\\ ']/\\\\\\\\\\\\&/g" \
+			       sed -e "s/[][(){}<>\",:;^&\!$=?\`|\\ ']/\\\\\\\\\\\\&/g" \
 				   -e 's/[*@|=]$//g' -e 's/[^\/]$/& /g' ) )
 		return 0
 	fi
@@ -106,7 +106,7 @@ _scp()
 		local IFS=$'\t\n'
 		COMPREPLY=( "${COMPREPLY[@]}" $( command ls -aF1d $cur* \
 			    2>/dev/null | sed \
-			    -e "s/[][(){}<>\",:;^&!$&=?\`|\\ ']/\\\\&/g" \
+			    -e "s/[][(){}<>\",:;^&\!$=?\`|\\ ']/\\\\&/g" \
 			    -e 's/[*@|=]$//g' -e 's/[^\/]$/& /g' ) )
 	return 0
 }

debian/changelog

@@ -99,6 +99,7 @@ bash-completion (200811xx) UNRELEASED; urgency=low
   * Add .mp2 and .vdr to mplayer completion (RHBZ: #444467).
   * Add .mkv, .mp2 and .vdr to *xine completion (RHBZ: #444467).
   * Added lzop completion.
+  * Fix scp metacharacter escaping.
   
  -- David Paleino <d.paleino@gmail.com>  Sat, 17 Jan 2009 19:01:16 +0100