[ARVADOS] updated: 2de827e57ae9ba1b0d322199d071ae900a5b7e0c

git at public.curoverse.com git at public.curoverse.com
Wed May 7 11:53:22 EDT 2014


Summary of changes:
 apps/workbench/test/test_helper.rb                 |   20 +-
 sdk/python/.gitignore                              |    1 -
 sdk/python/arvados/events.py                       |   33 ++
 sdk/python/arvados/fuse.py                         |  317 -----------
 sdk/python/arvados/fuse/__init__.py                |  585 ++++++++++++++++++++
 sdk/python/bin/arv-mount                           |   40 +-
 sdk/python/build.sh                                |   16 -
 sdk/python/requirements.txt                        |    3 +
 sdk/python/run_test_server.py                      |   86 +++
 sdk/python/{setup.py.src => setup.py}              |    9 +-
 sdk/python/setup.py.src                            |    8 +-
 sdk/python/setup_fuse.py                           |   21 +
 sdk/python/setup_header.py                         |   11 +
 sdk/python/test_mount.py                           |  246 +++++++--
 sdk/python/test_websockets.py                      |   32 ++
 .../controllers/arvados/v1/schema_controller.rb    |    4 +-
 16 files changed, 1028 insertions(+), 404 deletions(-)
 create mode 100644 sdk/python/arvados/events.py
 delete mode 100644 sdk/python/arvados/fuse.py
 create mode 100644 sdk/python/arvados/fuse/__init__.py
 delete mode 100755 sdk/python/build.sh
 create mode 100644 sdk/python/run_test_server.py
 copy sdk/python/{setup.py.src => setup.py} (82%)
 create mode 100644 sdk/python/setup_fuse.py
 create mode 100644 sdk/python/setup_header.py
 create mode 100644 sdk/python/test_websockets.py

       via  2de827e57ae9ba1b0d322199d071ae900a5b7e0c (commit)
       via  d9aa5decc6edce30285df049277de2cf2c138c26 (commit)
       via  31c711afc4ff8a1728aeb3e5f405a131047671c9 (commit)
       via  5b252752cdfd8b129d10913f7e2ec7b47f544ead (commit)
       via  e6aa5b48be1209d74c4c69be3eeca549f02418f3 (commit)
       via  2e524eb008f8b70ca1263ccde460365109c66a90 (commit)
       via  b5f193aa657134822d4df67cabc25c631926395b (commit)
       via  ff1e29f702d4f3036f5af014ad6e423b886ed0bb (commit)
       via  66f1ae7a9be590461592199c6d3646dbc4eba786 (commit)
       via  4bd14ccfa216fe1d115772508ac7d7c64ec59a48 (commit)
       via  cbf0429a8a5edd2f8a8d9b01ce39334e07e56bf8 (commit)
       via  121fb6bdcdf3731903ce3d21c0a284c20e6a6fca (commit)
       via  6abcf1f6bdb82b176a9fbb48b6c7cefa64970a9d (commit)
       via  2b03b05de753509c026b4c67857cd49a11f44dcf (commit)
       via  603bccd66ac868c2accf9dff9c3ca6b7feeed962 (commit)
       via  1f763a5b1ad5c65a3265b4284958ecc0fe336f50 (commit)
       via  9143c3ec039d6c89512055f70c2fcc6e1065f1d7 (commit)
       via  a8918e636507200148758302dc6b9a081dc2f206 (commit)
      from  222ce386e36b3d146e718a5d2f64a95fb30996bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2de827e57ae9ba1b0d322199d071ae900a5b7e0c
Merge: 222ce38 d9aa5de
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed May 7 11:53:13 2014 -0400

    Merge branch 'origin-2035-arv-mount-tags-folders'
    
    Conflicts:
    	sdk/python/bin/arv-mount

diff --cc sdk/python/bin/arv-mount
index cc7e288,fc5491f..e7e559c
--- a/sdk/python/bin/arv-mount
+++ b/sdk/python/bin/arv-mount
@@@ -15,10 -20,12 +20,14 @@@ mountpoint before --exec, or mark the e
  with "--".
  """)
      parser.add_argument('mountpoint', type=str, help="""Mount point.""")
 +    parser.add_argument('--allow-other', action='store_true',
 +                        help="""Let other users read the mount""")
-     parser.add_argument('--collection', type=str, help="""Collection locator""")
+     parser.add_argument('--collection', type=str, help="""Mount only the specified collection at the mount point.""")
+     parser.add_argument('--tags', action='store_true', help="""Mount as a virtual directory consisting of subdirectories representing tagged
+ collections on the server.""")
+     parser.add_argument('--groups', action='store_true', help="""Mount as a virtual directory consisting of subdirectories representing groups on the server.""")
      parser.add_argument('--debug', action='store_true', help="""Debug mode""")
+     parser.add_argument('--foreground', action='store_true', help="""Run in foreground (default is to daemonize unless --exec specified)""", default=False)
      parser.add_argument('--exec', type=str, nargs=argparse.REMAINDER,
                          dest="exec_args", metavar=('command', 'args', '...', '--'),
                          help="""Mount, run a command, then unmount and exit""")
@@@ -37,13 -49,16 +51,13 @@@
          operations.inodes.add_entry(MagicDirectory(llfuse.ROOT_INODE, operations.inodes))
  
      # FUSE options, see mount.fuse(8)
 -    opts = []
 -
 -    # Enable FUSE debugging (logs each FUSE request)
 -    if args.debug:
 -        opts += ['debug']
 +    opts = [optname for optname in ['allow_other', 'debug']
 +            if getattr(args, optname)]
  
-     # Initialize the fuse connection
-     llfuse.init(operations, args.mountpoint, opts)
- 
      if args.exec_args:
+         # Initialize the fuse connection
+         llfuse.init(operations, args.mountpoint, opts)
+ 
          t = threading.Thread(None, lambda: llfuse.main())
          t.start()
  

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list