[Monotone-commits-diffs] net.venge.monotone: 7ba2468e98b07c8d3845e1c1aea868b738d330f4

[code]

revision:            7ba2468e98b07c8d3845e1c1aea868b738d330f4
date:                2013-09-23T19:29:27
author:              address@hidden
branch:              net.venge.monotone
changelog:
Correct extra test for bash_completion. By Thomas Moschny.

 * test/extra/bash_completion/bashrc: source (i.e. include)
   /usr/share/bash-completion/bash_completion, if it exists
 * test/extra/bash_completion/library.exp: correct a typo

manifest:
format_version "1"

new_manifest [fbc671ac51129a70bb093548fc85d2f000330c2f]

old_revision [fe1180f754da5d552c308b61e8129e59039bc559]

patch "test/extra/bash_completion/bashrc"
 from [dd471a4f720b559295d901a73908cbc667f7227c]
   to [9bfb51f200049e63dfa3c23245e835aabac82f9c]

patch "test/extra/bash_completion/library.exp"
 from [9dfa60486e6ab48510e91cc3442842d596c73fab]
   to [01e711817b556f3c0dd4029dc52d7700ce835b4b]
============================================================
--- test/extra/bash_completion/bashrc	dd471a4f720b559295d901a73908cbc667f7227c
+++ test/extra/bash_completion/bashrc	9bfb51f200049e63dfa3c23245e835aabac82f9c
@@ -18,6 +18,8 @@ if [ "$BASH_COMPLETION" = "" ]; then
 	. /etc/bash_completion
     elif [ -f /usr/local/etc/bash_completion ]; then
 	. /usr/local/etc/bash_completion
+    elif [ -f /usr/share/bash-completion/bash_completion ] ; then
+	. /usr/share/bash-completion/bash_completion
     elif [ -f /usr/share/bash-completion/.pre -a \
            -f /usr/share/bash-completion/base ]; then
         # In Gentoo /etc/profile.d/bash-completion.sh sources required
============================================================
--- test/extra/bash_completion/library.exp	9dfa60486e6ab48510e91cc3442842d596c73fab
+++ test/extra/bash_completion/library.exp	01e711817b556f3c0dd4029dc52d7700ce835b4b
@@ -16,7 +16,7 @@ set env(srcdir) $srcdir
 set env(initial_dir) $initial_dir
 set env(srcdir) $srcdir
 # some user's ~/.bash_profile start xserver etc; don't do that
-spawn "bash" "--init-file" "/dev/nul" "--rcfile" "$srcdir/extra/bash_completion/bashrc"
+spawn "bash" "--init-file" "/dev/null" "--rcfile" "$srcdir/extra/bash_completion/bashrc"
 # If there is no completion package, it's no point trying this.
 # Make sure we do get a prompt.
 expect {