From b608bf71db9a0faf20d7707ba74038869412c6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Borgstr=C3=B6m?= <jonas@borgstrom.se>
Date: Sat, 2 Jul 2011 19:46:41 +0200
Subject: [PATCH] Remove sub command "init". Stores are now auto-created

---
 darc/archiver.py | 12 +-----------
 darc/store.py    |  2 +-
 darc/test.py     |  1 -
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/darc/archiver.py b/darc/archiver.py
index 1ccea8a12..bc9477d83 100644
--- a/darc/archiver.py
+++ b/darc/archiver.py
@@ -41,15 +41,11 @@ class Archiver(object):
             else:
                 print msg,
 
-    def do_init(self, args):
-        self.open_store(args.store, create=True)
-        return self.exit_code
-
     def do_serve(self, args):
         return StoreServer().serve()
 
     def do_create(self, args):
-        store = self.open_store(args.archive)
+        store = self.open_store(args.archive, create=True)
         keychain = Keychain(args.keychain)
         try:
             Archive(store, keychain, args.archive.archive)
@@ -234,12 +230,6 @@ class Archiver(object):
         subparser = subparsers.add_parser('change-password')
         subparser.set_defaults(func=self.do_keychain_chpass)
 
-        subparser = subparsers.add_parser('init')
-        subparser.set_defaults(func=self.do_init)
-        subparser.add_argument('store', metavar='STORE',
-                               type=location_validator(archive=False),
-                               help='Store to initialize')
-
         subparser = subparsers.add_parser('serve')
         subparser.set_defaults(func=self.do_serve)
 
diff --git a/darc/store.py b/darc/store.py
index 779f08f96..c43e30b85 100644
--- a/darc/store.py
+++ b/darc/store.py
@@ -32,7 +32,7 @@ class Store(object):
 
     def __init__(self, path, create=False):
         self.txn_active = False
-        if create:
+        if not os.path.exists(path) and create:
             self.create(path)
         self.open(path)
 
diff --git a/darc/test.py b/darc/test.py
index 026bbdfb5..5b074bbe2 100644
--- a/darc/test.py
+++ b/darc/test.py
@@ -30,7 +30,6 @@ class Test(unittest.TestCase):
         self.keychain = '/tmp/_test_dedupstore.keychain'
         if not os.path.exists(self.keychain):
             self.darc('init-keychain')
-        self.darc('init', self.store_path)
 
     def tearDown(self):
         shutil.rmtree(self.tmpdir)