From 3726ca0c5d51637e253943273e85b346497eb1e4 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 26 Oct 2018 08:50:25 +0000 Subject: [PATCH] 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 --- .../ansiblebridge/AnsibleBridge.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java index 19a6e41..29fe9ae 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java @@ -284,33 +284,33 @@ public class AnsibleBridge ***REMOVED*** /** * Generate all roles for this dependency - * @param d + * @param dep Dependency */ - public Collection generateRoles(Dependency d) ***REMOVED*** + public Collection generateRoles(Dependency dep) ***REMOVED*** Collection roles = new Vector<>(); - if("os".equalsIgnoreCase(d.getType())) ***REMOVED*** - OSDependencyPackage pkg = new OSDependencyPackage(d); + if("os".equalsIgnoreCase(dep.getType())) ***REMOVED*** + OSDependencyPackage pkg = new OSDependencyPackage(dep); if(pkg!=null) ***REMOVED*** roles.addAll(pkg.getRoles(this.getTemplateManager())); ***REMOVED*** - ***REMOVED*** else if("custom".equalsIgnoreCase(d.getType())) ***REMOVED*** - CustomDependencyPackage pkg = new CustomDependencyPackage(d); + ***REMOVED*** else if("custom".equalsIgnoreCase(dep.getType())) ***REMOVED*** + CustomDependencyPackage pkg = new CustomDependencyPackage(dep); if(pkg!=null) ***REMOVED*** roles.addAll(pkg.getRoles(this.getCustomRoleManager())); ***REMOVED*** ***REMOVED*** - else if("github".equalsIgnoreCase(d.getType())) ***REMOVED*** - CranDependencyPackage pkg = new CranDependencyPackage(d); + else if("github".equalsIgnoreCase(dep.getType())) ***REMOVED*** + CranDependencyPackage pkg = new CranDependencyPackage(dep); if(pkg!=null) ***REMOVED*** roles.addAll(pkg.getRoles(this.getTemplateManager())); ***REMOVED*** ***REMOVED*** - else if("cran".equalsIgnoreCase(d.getType())) ***REMOVED*** - CranDependencyPackage pkg = new CranDependencyPackage(d); + else if("cran".equalsIgnoreCase(dep.getType())) ***REMOVED*** + CranDependencyPackage pkg = new CranDependencyPackage(dep); if(pkg!=null) ***REMOVED*** roles.addAll(pkg.getRoles(this.getTemplateManager())); ***REMOVED***