From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 18 May 2008 11:53:41 +0000 (+0200)
Subject: Merge from Debian
X-Git-Tag: userdir-ldap-0.3.31~2^2~1
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=a599d46c4f33a68d1033bba48060089749ec5e0d;hp=54432ce1af06ed844ee9ca02dd1e059daada6427

Merge from Debian
---

diff --git a/debian/changelog b/debian/changelog
index ac00d77..9cd0018 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+userdir-ldap (0.3.XX) Xnstable; urgency=low
+
+  * ud-replicate: sgran pointed out that if all we care about ignoring is
+    EEXIST then we should use mkdir -p instead of [ -d userkeys ] || mkdir
+    userkeys.
+
+ -- Peter Palfrader <weasel@debian.org>  Sun, 18 May 2008 13:40:04 +0200
+
 userdir-ldap (0.3.25+common1) unstable; urgency=low
 
   [ Martin Zobel-Helas ]
diff --git a/ud-replicate b/ud-replicate
index d2a065f..a9e294b 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -81,7 +81,7 @@ if [ -e ${HOST}/ssh-keys.tar.gz ]; then
   export TMPDIR='/tmp/'
   tempdir=$(mktemp -d)
   tar -C "$tempdir" -xf ${HOST}/ssh-keys.tar.gz
-  [ -d userkeys ] || mkdir userkeys
+  mkdir -p userkeys
   chmod 755 $tempdir
   rsync -a --delete-after $tempdir/ userkeys/
 fi