Skip to content

Commit

Permalink
RPACU-54 Install packages to the specified library path
Browse files Browse the repository at this point in the history
  • Loading branch information
scanopm committed Dec 9, 2019
1 parent 20a7ef9 commit eedffd8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
7 changes: 7 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
0.2.1
-----

- RPACU-54 Bug fix, custom library path not taken into account while
installing
- Fix missing column 'linkingTo' for the csv file output (rpackscan)

0.2.0
-----

Expand Down
6 changes: 4 additions & 2 deletions rpackutils/providers/renvironment.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ def _installpackage(self, packagepath):
packInfo.licenseclass)
logger.warning(message)
cmd = os.path.join(self._Rbinarypath)
cmdargs = [cmd, 'CMD', 'INSTALL', packagepath]
cmdargs = [cmd, 'CMD', 'INSTALL', packagepath,
"--library={}".format(self._repofullpath)]
logger.info('Running: {}'.format(" ".join(cmdargs)))
p = subprocess.Popen(
cmdargs,
Expand Down Expand Up @@ -246,7 +247,8 @@ def _installpackage_dryrun(self, packagepath, dest):
shutil.copy(packagepath, dest)
cmd = os.path.join(self._Rbinarypath)
destpackagepath = os.path.join(dest, os.path.basename(packagepath))
cmdargs = [cmd, 'CMD', 'INSTALL', destpackagepath]
cmdargs = [cmd, 'CMD', 'INSTALL', destpackagepath,
"--library={}".format(self._repofullpath)]
command = " ".join(cmdargs)
# Write installation commands to the install.sh script
scriptfilepath = os.path.join(dest, 'install.sh')
Expand Down

0 comments on commit eedffd8

Please sign in to comment.