Apply patch from Vagrant Cascadian <vagrant+bugs@freegeek.org> not fail if resolv.conf is a broken symlink (closes: #390647).

r61715

2 files changed, 3 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 16a6b27..46a568c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ debootstrap (1.0.21) UNRELEASED; urgency=low
 
   [ Otavio Salvador ]
   * Document new --extractor option in manpage.
+  * Apply patch from Vagrant Cascadian <vagrant+bugs@freegeek.org> not
+    fail if resolv.conf is a broken symlink (closes: #390647).
 
  -- Otavio Salvador <otavio@debian.org>  Mon, 16 Nov 2009 15:20:09 -0200
 
diff --git a/functions b/functions
index 33b5a46..0ba5ae7 100644
--- a/functions
+++ b/functions
@@ -836,7 +836,7 @@ in_target () {
 
 conditional_cp () {
 	if [ ! -e "$2/$1" ]; then
-		if [ -L "$1" ]; then
+		if [ -L "$1" ] && [ -e "$1" ]; then
 			cat "$1" >"$2/$1"
 		elif [ -e "$1" ]; then
 			cp -a "$1" "$2/$1"