Merge lp:~dholbach/command-not-found/1479805 into lp:~command-not-found-developers/command-not-found/trunk

[Daniel Holbach]

* bash_command_not_found:
      - Print an error message if a command is not found, and the package
        has been removed but not purged. (LP: #1479805)
      - Do not define the handler function if the package has been
        removed.
      - Do not define the handler function if the shell is not
        interactive.
  * zsh_command_not_found:
      - Do not define the handler function if the shell is not
        interactive.
      - Reindent file in order to fit on an 80 characters wide terminal
        without line wrapping.

[CarstenHey (c.hey)]

Hi,

thanks for putting all this into a merge request :)

You copied my error into the bash part of the commit message, this:

| - Do not define the handler function if the shell is interactive.

should be:

| - Do not define the handler function if the shell is not interactive.

Also, this part is missing in the commit message (but the fix is
upstream only, to fix it in Ubuntu, the bash package has to be
adapted):

| - Don't run command-not-found if bash_completion is used.

Changing the merge request just because of an suboptimal commit
message (JFTR: this was my fault) might be a waste of time, though.

The reason I choose to abstain instead of to approve is because
the Ubuntu package already contains a fixed zsh_command_not_found,
to which this merge request adds some minor improvements. If merging
from the package to upstream first avoids a merge conflict, then
doing so might be a good idea - since I lack some essential
launchpad related knowledge, I'm not able to judge this.

The changelog entry of the previous upload to wily is:

  [ Carsten Hey ]
  * Update /etc/zsh_command_not_found:
    - Don't overwrite an already defined command-not-found handler.
    - Don't try to run command-not-found if the package has been
      removed since the shell has been started.

  [ Michael Vogt ]
  * updated for latest wily

 -- Michael Vogt <email address hidden> Tue, 21 Jul 2015 08:02:05 +0200

Even though the actual bug does not affect the Ubuntu package,
I think this patch should be applied - I just don't know which
way the former change to zsh_command_not_found should be merged
(actually, the new file should replace the old one, but bzr does
not know that).

Regards
Carsten

review: Abstain

[CarstenHey (c.hey)]

I could change this to "approve" if the possible merge conflict in the package is not an relevant issue for you or mvo, and if it makes any difference if I abstain or approve.

[CarstenHey (c.hey)]

I think the possible merge conflict is not relevant in practice

review: Approve

Unmerged revisions

157. By Daniel Holbach on 2015-10-26

Apply patches from Carsten Hey from LP: #1479805

  * bash_command_not_found:
      - Print an error message if a command is not found, and the package
        has been removed but not purged. (LP: #1479805)
      - Do not define the handler function if the package has been removed.
      - Do not define the handler function if the shell is interactive.
  * zsh_command_not_found:
      - Do not define the handler function if the shell is not interactive.
      - Reindent file in order to fit on an 80 characters wide terminal without
        line wrapping.

156. By Zygmunt Krynicki on 2013-11-04

Merge locale fix from Anthony Wong

155. By Zygmunt Krynicki on 2013-07-30

Merge fix for python3 support

154. By Michael Vogt on 2012-06-26

setup.py: call version 0.3 as its a python*3* verison ;)

153. By Michael Vogt on 2012-06-14

merged python3 port lp:~cjwatson/command-not-found/python3, thanks to Colin Watson

152. By Zygmunt Krynicki on 2012-06-03

Merge support for building pot files when running ./setup.py sdist

151. By Michael Vogt on 2012-01-13

merge from ubuntu but remove fixes we don't need

150. By Michael Vogt on 2012-01-13

cherry pick fixes from ubuntu

149. By Michael Vogt on 2012-01-13

merged lp:~mvo/command-not-found/remove-debian-dir

148. By Michael Vogt on 2012-01-13

merged lp:~mvo/command-not-found/install-prompt-env

=== modified file 'bash_command_not_found'
--- bash_command_not_found	2012-06-13 15:03:33 +0000
+++ bash_command_not_found	2015-10-26 10:26:51 +0000
@@ -4,11 +4,14 @@
 # This script will look-up command in the database and suggest
 # installation of packages available from the repository
 
-command_not_found_handle() {
-  if  [ -x /usr/lib/command-not-found ]; then
-     /usr/lib/command-not-found -- "$1" 
-     return $?
-  else
-     return 127
-  fi	    
-}
+if [[ -n "${PS1-}" && -x /usr/lib/command-not-found ]]; then
+  function command_not_found_handle() {
+    local FUNCNEST=5
+    if [[ -z "${COMP_CWORD+set}" && -x /usr/lib/command-not-found ]]; then
+      /usr/lib/command-not-found -- ${1+"$1"} || return $?
+    else
+      printf >&2 'bash: %scommand not found\n' ${1+"$1: "} || true
+      return 127
+    fi	    
+  }
+fi

=== modified file 'zsh_command_not_found'
--- zsh_command_not_found	2011-08-26 00:04:02 +0000
+++ zsh_command_not_found	2015-10-26 10:26:51 +0000
@@ -4,8 +4,11 @@
 # This script will look-up command in the database and suggest
 # installation of packages available from the repository
 
-if [[ -x /usr/lib/command-not-found ]] ; then
-	function command_not_found_handler() {
-		/usr/lib/command-not-found --no-failure-msg -- $1
-	}
+if  (( ! ${+functions[command_not_found_handler]} )) &&
+    [[ -n ${PS1-} && -x /usr/lib/command-not-found ]]
+then
+    function command_not_found_handler {
+        [[ -x /usr/lib/command-not-found ]] &&
+	/usr/lib/command-not-found --no-failure-msg -- ${1+"$1"} && return 1
+    }
 fi