[Da-tools-commits] ./da-tools/userdir-ldap-common r401: Merge from Debian

[Joerg Jaspert]

------------------------------------------------------------
revno: 401
committer: Joerg Jaspert <joerg at debian.org>
branch nick: userdir-ldap-common
timestamp: Sun 2008-05-18 13:53:41 +0200
message:
  Merge from Debian
modified:
  debian/changelog
  ud-replicate
    ------------------------------------------------------------
    revno: 349.5.19
    committer: Peter Palfrader <peter at palfrader.org>
    branch nick: userdir-ldap
    timestamp: Sun 2008-05-18 13:41:10 +0200
    message:
      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.
    modified:
      debian/changelog
      ud-replicate
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-18 11:45:59 +0000
+++ b/debian/changelog	2008-05-18 11:53:41 +0000
@@ -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 at debian.org>  Sun, 18 May 2008 13:40:04 +0200
+
 userdir-ldap (0.3.25+common1) unstable; urgency=low
 
   [ Martin Zobel-Helas ]

=== modified file 'ud-replicate'
--- a/ud-replicate	2008-05-18 11:37:40 +0000
+++ b/ud-replicate	2008-05-18 11:53:41 +0000
@@ -81,7 +81,7 @@
   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