Import s3ql_1.7.orig.tar.bz2

10 files changed, 20 insertions, 20 deletions

diff --git a/bin/fsck.s3ql b/bin/fsck.s3ql
index f0dffb6..3c69f69 100755
--- a/bin/fsck.s3ql
+++ b/bin/fsck.s3ql
@@ -19,5 +19,5 @@ if (os.path.exists(os.path.join(basedir, 'setup.py')) and
     os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
     sys.path = [os.path.join(basedir, 'src')] + sys.path
     
-import s3ql.cli.fsck
-s3ql.cli.fsck.main(sys.argv[1:])
\ No newline at end of file
+import s3ql.fsck
+s3ql.fsck.main(sys.argv[1:])
\ No newline at end of file
diff --git a/bin/mkfs.s3ql b/bin/mkfs.s3ql
index 47b3131..94f3443 100755
--- a/bin/mkfs.s3ql
+++ b/bin/mkfs.s3ql
@@ -19,5 +19,5 @@ if (os.path.exists(os.path.join(basedir, 'setup.py')) and
     os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
     sys.path = [os.path.join(basedir, 'src')] + sys.path
     
-import s3ql.cli.mkfs
-s3ql.cli.mkfs.main(sys.argv[1:])
\ No newline at end of file
+import s3ql.mkfs
+s3ql.mkfs.main(sys.argv[1:])
\ No newline at end of file
diff --git a/bin/mount.s3ql b/bin/mount.s3ql
index 94fc5f8..8e5e7b1 100755
--- a/bin/mount.s3ql
+++ b/bin/mount.s3ql
@@ -19,5 +19,5 @@ if (os.path.exists(os.path.join(basedir, 'setup.py')) and
     os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
     sys.path = [os.path.join(basedir, 'src')] + sys.path
     
-import s3ql.cli.mount
-s3ql.cli.mount.main(sys.argv[1:])
\ No newline at end of file
+import s3ql.mount
+s3ql.mount.main(sys.argv[1:])
\ No newline at end of file
diff --git a/bin/s3qladm b/bin/s3qladm
index f4667d3..3baa85e 100755
--- a/bin/s3qladm
+++ b/bin/s3qladm
@@ -19,5 +19,5 @@ if (os.path.exists(os.path.join(basedir, 'setup.py')) and
     os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
     sys.path = [os.path.join(basedir, 'src')] + sys.path
     
-import s3ql.cli.adm
-s3ql.cli.adm.main(sys.argv[1:])
+import s3ql.adm
+s3ql.adm.main(sys.argv[1:])
diff --git a/bin/s3qlcp b/bin/s3qlcp
index c62ef24..cbf7355 100755
--- a/bin/s3qlcp
+++ b/bin/s3qlcp
@@ -19,5 +19,5 @@ if (os.path.exists(os.path.join(basedir, 'setup.py')) and
     os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
     sys.path = [os.path.join(basedir, 'src')] + sys.path
     
-import s3ql.cli.cp
-s3ql.cli.cp.main(sys.argv[1:])
+import s3ql.cp
+s3ql.cp.main(sys.argv[1:])
diff --git a/bin/s3qlctrl b/bin/s3qlctrl
index 27dbd7c..9a44906 100755
--- a/bin/s3qlctrl
+++ b/bin/s3qlctrl
@@ -19,5 +19,5 @@ if (os.path.exists(os.path.join(basedir, 'setup.py')) and
     os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
     sys.path = [os.path.join(basedir, 'src')] + sys.path
     
-import s3ql.cli.ctrl
-s3ql.cli.ctrl.main(sys.argv[1:])
+import s3ql.ctrl
+s3ql.ctrl.main(sys.argv[1:])
diff --git a/bin/s3qllock b/bin/s3qllock
index b13c730..2873229 100755
--- a/bin/s3qllock
+++ b/bin/s3qllock
@@ -19,5 +19,5 @@ if (os.path.exists(os.path.join(basedir, 'setup.py')) and
     os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
     sys.path = [os.path.join(basedir, 'src')] + sys.path
     
-import s3ql.cli.lock
-s3ql.cli.lock.main(sys.argv[1:])
+import s3ql.lock
+s3ql.lock.main(sys.argv[1:])
diff --git a/bin/s3qlrm b/bin/s3qlrm
index a98b3c5..5b9ed34 100755
--- a/bin/s3qlrm
+++ b/bin/s3qlrm
@@ -19,5 +19,5 @@ if (os.path.exists(os.path.join(basedir, 'setup.py')) and
     os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
     sys.path = [os.path.join(basedir, 'src')] + sys.path
     
-import s3ql.cli.remove
-s3ql.cli.remove.main(sys.argv[1:])
+import s3ql.remove
+s3ql.remove.main(sys.argv[1:])
diff --git a/bin/s3qlstat b/bin/s3qlstat
index 1650c6f..748af6e 100755
--- a/bin/s3qlstat
+++ b/bin/s3qlstat
@@ -19,5 +19,5 @@ if (os.path.exists(os.path.join(basedir, 'setup.py')) and
     os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
     sys.path = [os.path.join(basedir, 'src')] + sys.path
     
-import s3ql.cli.statfs
-s3ql.cli.statfs.main(sys.argv[1:])
+import s3ql.statfs
+s3ql.statfs.main(sys.argv[1:])
diff --git a/bin/umount.s3ql b/bin/umount.s3ql
index 48f014b..db082a8 100755
--- a/bin/umount.s3ql
+++ b/bin/umount.s3ql
@@ -19,5 +19,5 @@ if (os.path.exists(os.path.join(basedir, 'setup.py')) and
     os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
     sys.path = [os.path.join(basedir, 'src')] + sys.path
     
-import s3ql.cli.umount
-s3ql.cli.umount.main(sys.argv[1:])
\ No newline at end of file
+import s3ql.umount
+s3ql.umount.main(sys.argv[1:])
\ No newline at end of file