From 6f5ccb170753fb003c41cb899d0d43468c3926f9 Mon Sep 17 00:00:00 2001 From: robk-tahoe Date: Tue, 19 Feb 2008 17:18:17 -0700 Subject: [PATCH] macfuse: move macfuse files around to simplify pythonpath the mac/macfuse subdirectory needed to be added to the pythonpath in order to build a binary incorporating the mac fuse system. this change should make those modules accessible relative to the mac/ directory which is implicitly included in the .app build process. --- mac/allmydata_tahoe.py | 4 ++-- mac/{macfuse => }/fuse.py | 0 mac/{macfuse => }/fuseparts/__init__.py | 0 mac/{macfuse => }/fuseparts/_fusemodule.so | Bin mac/{macfuse => }/fuseparts/setcompatwrap.py | 0 mac/{macfuse => }/fuseparts/subbedopts.py | 0 mac/{macfuse => }/tahoefuse.py | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename mac/{macfuse => }/fuse.py (100%) rename mac/{macfuse => }/fuseparts/__init__.py (100%) rename mac/{macfuse => }/fuseparts/_fusemodule.so (100%) rename mac/{macfuse => }/fuseparts/setcompatwrap.py (100%) rename mac/{macfuse => }/fuseparts/subbedopts.py (100%) rename mac/{macfuse => }/tahoefuse.py (100%) diff --git a/mac/allmydata_tahoe.py b/mac/allmydata_tahoe.py index cd4c780e..a21fc796 100644 --- a/mac/allmydata_tahoe.py +++ b/mac/allmydata_tahoe.py @@ -27,8 +27,8 @@ class FuseOptions(usage.Options): self.args = args def fuse(config, stdout, stderr): - import macfuse.tahoefuse - macfuse.tahoefuse.main(config.args) + import tahoefuse + tahoefuse.main(config.args) class FuseRunnerExtension(object): subCommands = [ diff --git a/mac/macfuse/fuse.py b/mac/fuse.py similarity index 100% rename from mac/macfuse/fuse.py rename to mac/fuse.py diff --git a/mac/macfuse/fuseparts/__init__.py b/mac/fuseparts/__init__.py similarity index 100% rename from mac/macfuse/fuseparts/__init__.py rename to mac/fuseparts/__init__.py diff --git a/mac/macfuse/fuseparts/_fusemodule.so b/mac/fuseparts/_fusemodule.so similarity index 100% rename from mac/macfuse/fuseparts/_fusemodule.so rename to mac/fuseparts/_fusemodule.so diff --git a/mac/macfuse/fuseparts/setcompatwrap.py b/mac/fuseparts/setcompatwrap.py similarity index 100% rename from mac/macfuse/fuseparts/setcompatwrap.py rename to mac/fuseparts/setcompatwrap.py diff --git a/mac/macfuse/fuseparts/subbedopts.py b/mac/fuseparts/subbedopts.py similarity index 100% rename from mac/macfuse/fuseparts/subbedopts.py rename to mac/fuseparts/subbedopts.py diff --git a/mac/macfuse/tahoefuse.py b/mac/tahoefuse.py similarity index 100% rename from mac/macfuse/tahoefuse.py rename to mac/tahoefuse.py -- 2.45.2