repo: resdb
action: commit
revision: 
path_from: 
revision_from: 59c1751062b903e3e009afd6ec0effb3bf29f1c0:
path_to: 
revision_to: 

commit 59c1751062b903e3e009afd6ec0effb3bf29f1c0
Merge: b09ebf6 a1eca4f
Author: epoch 
Date:   Fri May 24 02:39:47 2013 +0000

    There was some werid stuff with add_dom went with what looked like the best
    of the conflicting lines.
    Merge branch 'master' of git://1.4.7.7/resdb

    Conflicts:
            scripts/add_dom

diff --cc scripts/add_dom
index 013ce18b60ac02d6a2ada93bf7473e3bc3a050fe,34ccb0c2cfc96cbfac7fdcb75d17dcebb28d62f3..b60a964d04c54d3aec961c99b2e9283131e036fa
--- a/scripts/add_dom
+++ b/scripts/add_dom
@@@ -4,8 -4,8 +4,8 @@@ if [ x"$2" = x ]; the
   echo "Usage: $0   [...]" >&2; exit 255
  fi

 -dir=db/dom/"$(echo "$1" | tr . '\n' | tac | tr '\n' / | head -c -1)"
 +dir=db/dom/"$(echo "$1" | tr . '\n' | tac | tr '\n' / | ./scripts/head_-c_-1)"
- mkdir "$dir" || exit 1
+ mkdir -p "$dir" || exit 1
  echo "$2" > "$dir/owner"
  mkdir "$dir/ns" || exit 1
  shift; shift;

-----END OF PAGE-----