diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-01-13 23:43:11 +0100 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-01-14 09:15:32 +0100 |
| commit | 3f0d95a06117b92ff16650a747bea6119624f556 (patch) | |
| tree | 18d19a7ddb5ab17181dd6f7d716e3c1d65859bfc /__root__ | |
| parent | a291ba5443edf4ea91b22b4ed531b79e7348bcd2 (diff) | |
| download | clufter-3f0d95a06117b92ff16650a747bea6119624f556.tar.gz clufter-3f0d95a06117b92ff16650a747bea6119624f556.tar.xz clufter-3f0d95a06117b92ff16650a747bea6119624f556.zip | |
run-dev/setup: fix not restoring the state when discovering
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to '__root__')
| -rwxr-xr-x | __root__/run-dev | 1 | ||||
| -rw-r--r-- | __root__/setup.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/__root__/run-dev b/__root__/run-dev index a5c23d4..607ea75 100755 --- a/__root__/run-dev +++ b/__root__/run-dev @@ -67,6 +67,7 @@ while True: if not self_discovery_plan: print "Cannot find myself, please help me with __project__ symlink" raise +sys.path.pop(0) # set the correct __package__ for relative imports __package__ = maybe_root_real # XXX optionally strip whole '-..' part diff --git a/__root__/setup.py b/__root__/setup.py index 2381680..70eebb6 100644 --- a/__root__/setup.py +++ b/__root__/setup.py @@ -463,9 +463,9 @@ while True: backup_mod = sys_modules.pop(project) backup_path, sys_path[:] = sys_path[:], [here] pkg = __import__(project, globals=pkg) - sys_path[:] = backup_path break except ImportError: + sys_path[:] = backup_path if backup_mod: sys_modules[project] = backup_mod if project == '__project__': @@ -475,6 +475,8 @@ while True: if not self_discovery_plan: print "Cannot find myself, please help me with __project__ symlink" raise +sys_path[:] = backup_path + #pkg_root = path_real('__project__') pkg_name = pkg.package_name() |