Merge lp:~qqwa-deactivatedaccount/command-not-found/add--no-failure-msg into lp:~command-not-found-developers/command-not-found/trunk

[qqwa]

add this option see the diff

[Zygmunt Krynicki (zyga)]

+1

review: Approve

[lp:~qqwa-deactivatedaccount/command-not-found/add--no-failure-msg]

142. By AJ on 2011-08-25

fix zsh integration

143. By AJ on 2011-08-26

use --no-failure-msg in zsh integration

[Zygmunt Krynicki (zyga)]

A patch bleed from another branch but both are welcome to land

review: Approve

=== modified file 'command-not-found'
--- command-not-found	2011-08-25 09:49:51 +0000
+++ command-not-found	2011-08-26 00:05:38 +0000
@@ -49,10 +49,13 @@
     parser.add_option('--ignore-installed', '--ignore-installed',
                       action='store_true',  default=False,
                       help=_("ignore local binaries and display the available packages"))
+    parser.add_option('--no-failure-msg',
+                      action='store_true', default=False,
+                      help=_("don't print '<command-name>: command not found'"))
     (options, args) = parser.parse_args()
     if len(args) == 1:
         cnf = CommandNotFound(options.data_dir)
-        if not cnf.advise(args[0], options.ignore_installed):
+        if not cnf.advise(args[0], options.ignore_installed) and not options.no_failure_msg:
             print >>sys.stderr, _("%s: command not found") % args[0]
 
 if __name__ == "__main__":

=== modified file 'zsh_command_not_found'
--- zsh_command_not_found	2011-08-15 08:19:48 +0000
+++ zsh_command_not_found	2011-08-26 00:05:38 +0000
@@ -4,22 +4,8 @@
 # This script will look-up command in the database and suggest
 # installation of packages available from the repository
 
-# Pseudo-namespace cnf_
-
-function cnf_preexec() {
-	typeset -g cnf_command="${1%% *}"
-}
-
-function cnf_precmd() {
-	(($? == 127)) && [ -n "$cnf_command" ] && [ -x /usr/lib/command-not-found ] && {
-		whence -- "$cnf_command" >& /dev/null ||
-			/usr/bin/python /usr/lib/command-not-found -- "$cnf_command"
-		unset cnf_command
+if [[ -x /usr/lib/command-not-found ]] ; then
+	function command_not_found_handler() {
+		/usr/lib/command-not-found --no-failure-msg -- $1
 	}
-}
-
-typeset -ga preexec_functions
-typeset -ga precmd_functions
-preexec_functions+=cnf_preexec
-precmd_functions+=cnf_precmd
-
+fi