Jim MacArthur pushed to branch jmac/stop-caching-vdirs at BuildStream / buildstream
Commits:
-
155e616a
by Jim MacArthur at 2018-09-24T15:46:23Z
1 changed file:
Changes:
| ... | ... | @@ -1532,8 +1532,6 @@ class Element(Plugin): |
| 1532 | 1532 |
with _signals.terminator(cleanup_rootdir), \
|
| 1533 | 1533 |
self.__sandbox(rootdir, output_file, output_file, self.__sandbox_config) as sandbox: # nopep8
|
| 1534 | 1534 |
|
| 1535 |
- sandbox_vroot = sandbox.get_virtual_directory()
|
|
| 1536 |
- |
|
| 1537 | 1535 |
# By default, the dynamic public data is the same as the static public data.
|
| 1538 | 1536 |
# The plugin's assemble() method may modify this, though.
|
| 1539 | 1537 |
self.__dynamic_public = _yaml.node_copy(self.__public)
|
| ... | ... | @@ -1581,7 +1579,6 @@ class Element(Plugin): |
| 1581 | 1579 |
finally:
|
| 1582 | 1580 |
if collect is not None:
|
| 1583 | 1581 |
try:
|
| 1584 |
- # Sandbox will probably have replaced its virtual directory, so get it again
|
|
| 1585 | 1582 |
sandbox_vroot = sandbox.get_virtual_directory()
|
| 1586 | 1583 |
collectvdir = sandbox_vroot.descend(collect.lstrip(os.sep).split(os.sep))
|
| 1587 | 1584 |
except VirtualDirectoryError:
|
| ... | ... | @@ -1606,6 +1603,7 @@ class Element(Plugin): |
| 1606 | 1603 |
collectvdir.export_files(filesdir, can_link=True)
|
| 1607 | 1604 |
|
| 1608 | 1605 |
try:
|
| 1606 |
+ sandbox_vroot = sandbox.get_virtual_directory()
|
|
| 1609 | 1607 |
sandbox_build_dir = sandbox_vroot.descend(
|
| 1610 | 1608 |
self.get_variable('build-root').lstrip(os.sep).split(os.sep))
|
| 1611 | 1609 |
# Hard link files from build-root dir to buildtreedir directory
|