Author: dmeyer
Date: Fri Feb 15 09:40:10 2008
New Revision: 3106
Log:
make fusefs work again
Modified:
trunk/beacon/bin/beacon-mount
Modified: trunk/beacon/bin/beacon-mount
==============================================================================
--- trunk/beacon/bin/beacon-mount (original)
+++ trunk/beacon/bin/beacon-mount Fri Feb 15 09:40:10 2008
@@ -74,7 +74,8 @@
sys.exit(error_code)
-if __name__ == '__main__':
[EMAIL PROTECTED]()
+def main():
try:
# read arguments
opts = [ 'umount', 'help', 'type=' ]
@@ -82,7 +83,7 @@
except getopt.GetoptError:
usage(1)
- qtype = None
+ qtype = None
for o, a in opts:
if o == '-u':
# umount
@@ -130,9 +131,9 @@
t1 = time.time()
if 'dirname' in query:
if 'recursive' in query:
- result = kaa.beacon.get(query['dirname']).list(recursive=True)
+ result = (yield
kaa.beacon.get(query['dirname'])).list(recursive=True)
else:
- result = kaa.beacon.get(query['dirname']).list()
+ result = (yield kaa.beacon.get(query['dirname'])).list()
else:
result = kaa.beacon.query(**query)
@@ -143,7 +144,7 @@
print e
sys.exit(1)
- database = os.path.dirname(kaa.beacon.get_db_info()['file'])
+ database = os.path.dirname((yield kaa.beacon.get_db_info())['file'])
logfile = os.path.join(database, 'fuse.log')
# FIXME: should only daemonize when we know fs is mounted.
kaa.utils.daemonize(stdout = logfile)
@@ -151,4 +152,8 @@
thread = kaa.ThreadCallback(fs.main)
thread().exception.connect(lambda dummy: kaa.main.stop())
+
+if __name__ == '__main__':
+ main()
kaa.main.run()
+
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
