Skip to content

Commit d2efc91

Browse files
authored
Fix manuals path (#424)
1 parent 7ad4ce2 commit d2efc91

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

BBS-make-OUTGOING.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,12 @@ def copy_outgoing_pkgs(products_in_subdir, source_node):
119119
if BBSvars.buildtype in ['workflows', 'books', 'bioc-mac-arm64']:
120120
pass
121121
elif source_node:
122-
pdf_file = os.path.join(BBSutils.getenv('BBS_WORK_TOPDIR'),
123-
'meat',
122+
pdf_file = os.path.join(BBSvars.products_in_rdir.path,
123+
BBSutils.getSourceNode(),
124+
'checksrc',
124125
'%s.Rcheck' % pkg,
125126
'%s-manual.pdf' % pkg)
126-
print('BBS> [stage6b] - copying %s manual to OUTGOING/manuals folder...' % pkg)
127+
print('BBS> [stage6b] - copying %s to OUTGOING/manuals folder...' % pdf_file)
127128
if os.path.exists(pdf_file):
128129
dst = os.path.join(manuals_dir, '%s.pdf' % pkg)
129130
#shutil.copy(pdf_file, dst)

BBSutils.py

+8
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@ def getNodeSpec(node_hostname, key, key_is_optional=False):
109109
return specs.get(key)
110110
return specs[key]
111111

112+
# Return Source node's name to construct a path
113+
def getSourceNode():
114+
source_machines = []
115+
for build in getenv('BBS_OUTGOING_MAP').split(" "):
116+
if build.count("source"):
117+
source_machines.append(build.strip("source:|/buildsrc)"))
118+
return source_machines[0]
119+
112120

113121
##############################################################################
114122
### copyTheDamnedThingNoMatterWhat()

0 commit comments

Comments
 (0)