env change
This commit is contained in:
1 parent
1698344776
commit
d133db4e6e
2 files changed
+18
-3
No files matched your search
+16
-2
@@ -991,10 +991,24 @@ class Namespace(Assembly):
|
||||
starttime = time()
|
||||
try:
|
||||
titem = self.get_obj(name)
|
||||
if isinstance(titem, Proxy):
|
||||
# Proxy.__class__/__dir__ deliberately stay "shy" (report
|
||||
# LazyComponent / dir(LazyComponent)) while unresolved, so
|
||||
# that introspection - dir(), isinstance() against the
|
||||
# eventual wrapped type - can't accidentally trigger a real
|
||||
# device build (see Proxy's docstring). That means this
|
||||
# method can no longer use isinstance(titem,
|
||||
# InitialisationWaitable)/dir(titem) to *deliberately* force
|
||||
# resolution either - both now silently no-op on a still-lazy
|
||||
# proxy instead of building it, which used to leave every
|
||||
# name "successfully" init_name()'d without ever actually
|
||||
# leaving lazy_items (confirmed: init_all() reported success
|
||||
# while initialized_names stayed empty). __wrapped__ isn't
|
||||
# shy-cased, so accessing it forces the factory to run and
|
||||
# returns the real, resolved object.
|
||||
titem = titem.__wrapped__
|
||||
if isinstance(titem, InitialisationWaitable):
|
||||
titem._wait_for_initialisation()
|
||||
else:
|
||||
dir(titem)
|
||||
self.initialisation_times[name] = time() - starttime
|
||||
if verbose and not quiet:
|
||||
print(
|
||||
|
||||
+2
-1
@@ -18,7 +18,8 @@
|
||||
# first, ahead of the real install sitting in the same environment.
|
||||
# Verified: `python -c "import eco; print(eco.__file__)"` resolves to the
|
||||
# real install without this, and to this checkout with it.
|
||||
source bpy-default.sh
|
||||
#source bpy-default.sh
|
||||
source bpy-env
|
||||
|
||||
export PYTHONPATH="/sf/bernina/code/gac-bernina/eco${PYTHONPATH:+:$PYTHONPATH}"
|
||||
exec python /sf/bernina/code/gac-bernina/eco/eco_cli.py "$@"
|
||||
Reference in new issue
Block a user