gCubeSystem
/
dataminer-pool-manager
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

ref 12742: DataMiner - Support Python 3.6 

https://support.d4science.org/issues/12742

Python3.6 added

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@173834 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2018-10-26 08:50:25 +00:00
parent e4a4b07f12
commit 3726ca0c5d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java
View File

@ -284,33 +284,33 @@ public class AnsibleBridge ***REMOVED***
/** /**
* Generate all roles for this dependency * Generate all roles for this dependency
* @param d * @param dep Dependency
*/ */
public Collection<Role> generateRoles(Dependency d) ***REMOVED*** public Collection<Role> generateRoles(Dependency dep) ***REMOVED***
Collection<Role> roles = new Vector<>(); Collection<Role> roles = new Vector<>();
if("os".equalsIgnoreCase(d.getType())) ***REMOVED*** if("os".equalsIgnoreCase(dep.getType())) ***REMOVED***
OSDependencyPackage pkg = new OSDependencyPackage(d); OSDependencyPackage pkg = new OSDependencyPackage(dep);
if(pkg!=null) ***REMOVED*** if(pkg!=null) ***REMOVED***
roles.addAll(pkg.getRoles(this.getTemplateManager())); roles.addAll(pkg.getRoles(this.getTemplateManager()));
***REMOVED*** ***REMOVED***
***REMOVED*** else if("custom".equalsIgnoreCase(d.getType())) ***REMOVED*** ***REMOVED*** else if("custom".equalsIgnoreCase(dep.getType())) ***REMOVED***
CustomDependencyPackage pkg = new CustomDependencyPackage(d); CustomDependencyPackage pkg = new CustomDependencyPackage(dep);
if(pkg!=null) ***REMOVED*** if(pkg!=null) ***REMOVED***
roles.addAll(pkg.getRoles(this.getCustomRoleManager())); roles.addAll(pkg.getRoles(this.getCustomRoleManager()));
***REMOVED*** ***REMOVED***
***REMOVED*** ***REMOVED***
else if("github".equalsIgnoreCase(d.getType())) ***REMOVED*** else if("github".equalsIgnoreCase(dep.getType())) ***REMOVED***
CranDependencyPackage pkg = new CranDependencyPackage(d); CranDependencyPackage pkg = new CranDependencyPackage(dep);
if(pkg!=null) ***REMOVED*** if(pkg!=null) ***REMOVED***
roles.addAll(pkg.getRoles(this.getTemplateManager())); roles.addAll(pkg.getRoles(this.getTemplateManager()));
***REMOVED*** ***REMOVED***
***REMOVED*** ***REMOVED***
else if("cran".equalsIgnoreCase(d.getType())) ***REMOVED*** else if("cran".equalsIgnoreCase(dep.getType())) ***REMOVED***
CranDependencyPackage pkg = new CranDependencyPackage(d); CranDependencyPackage pkg = new CranDependencyPackage(dep);
if(pkg!=null) ***REMOVED*** if(pkg!=null) ***REMOVED***
roles.addAll(pkg.getRoles(this.getTemplateManager())); roles.addAll(pkg.getRoles(this.getTemplateManager()));
***REMOVED*** ***REMOVED***