Merge lp://staging/~dholbach/command-not-found/1479805 into lp://staging/~command-not-found-developers/command-not-found/trunk
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~dholbach/command-not-found/1479805 |
| Merge into: | lp://staging/~command-not-found-developers/command-not-found/trunk |
| Diff against target: |
46 lines (+18/-12) 2 files modified
bash_command_not_found (+11/-8) zsh_command_not_found (+7/-4) |
| To merge this branch: | bzr merge lp://staging/~dholbach/command-not-found/1479805 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| CarstenHey (community) | Approve | ||
| Command Not Found Developers | Pending | ||
|
Review via email:
|
|||
Commit message
* bash_command_
- 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
* zsh_command_
- Do not define the handler function if the shell is not
- Reindent file in order to fit on an 80 characters wide terminal
without line wrapping.
| CarstenHey (c.hey) wrote | # |
Unmerged revisions
- 157. By Daniel Holbach
-
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
-
Merge locale fix from Anthony Wong
- 155. By Zygmunt Krynicki
-
Merge fix for python3 support
- 154. By Michael Vogt
-
setup.py: call version 0.3 as its a python*3* verison ;)
- 153. By Michael Vogt
-
merged python3 port lp:~cjwatson/command-not-found/python3, thanks to Colin Watson
- 152. By Zygmunt Krynicki
-
Merge support for building pot files when running ./setup.py sdist
- 151. By Michael Vogt
-
merge from ubuntu but remove fixes we don't need
- 150. By Michael Vogt
-
cherry pick fixes from ubuntu
- 149. By Michael Vogt
- 148. By Michael Vogt
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_
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_
- 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_
(actually, the new file should replace the old one, but bzr does
not know that).
Regards
Carsten