Browse Source

Remove sub command "init". Stores are now auto-created

Jonas Borgström 14 years ago
parent
commit
b608bf71db
3 changed files with 2 additions and 13 deletions
  1. 1 11
      darc/archiver.py
  2. 1 1
      darc/store.py
  3. 0 1
      darc/test.py

+ 1 - 11
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)
 

+ 1 - 1
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)
 

+ 0 - 1
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)