[Monotone-commits-diffs] net.venge.monotone: 06738e14fae8309878e62cab9ea191be8fe891ce

[code]

revision:            06738e14fae8309878e62cab9ea191be8fe891ce
date:                2011-09-09T23:50:18
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
merge of '3d073d7ef08bfbe9f93dc2b6131486cc6e2f6aec'
     and '7cbb20501714be7f25f30734da82d41c7ac427ca'

manifest:
format_version "1"

new_manifest [ef3aa316ccf7637a97ef951bdda817d0545d4a21]

old_revision [3d073d7ef08bfbe9f93dc2b6131486cc6e2f6aec]

patch "src/unix/fs.cc"
 from [4a432ccc7d7f5926ba00b108f45960aa013d23b8]
   to [d34f7ed4b5cf3655d7920568e4e1a146fa670e13]

old_revision [7cbb20501714be7f25f30734da82d41c7ac427ca]

patch "test/extra/bash_completion/bashrc"
 from [50253c70d06f889a476b8333d5013c5512a1ef57]
   to [dd471a4f720b559295d901a73908cbc667f7227c]
============================================================
--- src/unix/fs.cc	4a432ccc7d7f5926ba00b108f45960aa013d23b8
+++ src/unix/fs.cc	d34f7ed4b5cf3655d7920568e4e1a146fa670e13
@@ -359,7 +359,7 @@ do_remove_recursive(string const & path)
   if (err == ENOENT)
     return; // nothing to delete
 
-  E(err == ENOTEMPTY, origin::system,
+  E((err == ENOTEMPTY) || (err == EEXIST), origin::system,
     F("could not remove '%s': %s") % path % os_strerror(err));
 
   // If we get here, it's a non-empty directory to be recursed through.
============================================================
--- test/extra/bash_completion/bashrc	50253c70d06f889a476b8333d5013c5512a1ef57
+++ test/extra/bash_completion/bashrc	dd471a4f720b559295d901a73908cbc667f7227c
@@ -18,6 +18,13 @@ 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/.pre -a \
+           -f /usr/share/bash-completion/base ]; then
+        # In Gentoo /etc/profile.d/bash-completion.sh sources required
+        # functions only if enabled with `eselect bashcomp`. We source
+        # required definitions manually.
+        . /usr/share/bash-completion/.pre
+        . /usr/share/bash-completion/base
     else
 	echo No bash completion package present.
 	exit