Merge pull request #80 from gvallee/v1.2.1

gvallee · web-flow · commit 787e7d780baf · 2019-12-17T10:43:11.000-05:00
Bug fixes for v1.2.1
diff --git a/etc/sympi_singularity.conf b/etc/sympi_singularity.conf
@@ -13,3 +13,4 @@ master=https://github.com/sylabs/singularity.git
 3.4.2=https://github.com/sylabs/singularity/releases/download/v3.4.2/singularity-3.4.2.tar.gz
 3.5.0=https://github.com/sylabs/singularity/releases/download/v3.5.0/singularity-3.5.0.tar.gz
 3.5.1=https://github.com/sylabs/singularity/releases/download/v3.5.1/singularity-3.5.1.tar.gz
+3.5.2=https://github.com/sylabs/singularity/releases/download/v3.5.2/singularity-3.5.2.tar.gz
diff --git a/pkg/sy/sy.go b/pkg/sy/sy.go
@@ -46,6 +46,8 @@ const (
 
 	// SudoCmdsKey is the key used to specify which Singularity commands need to be executed with sudo
 	SudoCmdsKey = "singularity_sudo_cmds"
+
+	sympiConfigFilename = "sympi_singularity.conf"
 )
 
 // GetPathToSyMPIConfigFile returns the path to the tool's configuration file
@@ -180,7 +182,7 @@ func IsSudoCmd(cmd string, sysCfg *sys.Config) bool {
 }
 
 func getSingularityConfigFilePath(sysCfg *sys.Config) string {
-	return filepath.Join(sysCfg.EtcDir, "synmpi_singularity.conf")
+	return filepath.Join(sysCfg.EtcDir, sympiConfigFilename)
 }
 
 // LoadSingularityReleaseConf loads from the configuration file the list of supported

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ const (`
`46`	`46`
`47`	`47`	`// SudoCmdsKey is the key used to specify which Singularity commands need to be executed with sudo`
`48`	`48`	`SudoCmdsKey = "singularity_sudo_cmds"`
	`49`	`+`
	`50`	`+ sympiConfigFilename = "sympi_singularity.conf"`
`49`	`51`	`)`
`50`	`52`
`51`	`53`	`// GetPathToSyMPIConfigFile returns the path to the tool's configuration file`
`@@ -180,7 +182,7 @@ func IsSudoCmd(cmd string, sysCfg *sys.Config) bool {`
`180`	`182`	`}`
`181`	`183`
`182`	`184`	`func getSingularityConfigFilePath(sysCfg *sys.Config) string {`
`183`		`- return filepath.Join(sysCfg.EtcDir, "synmpi_singularity.conf")`
	`185`	`+ return filepath.Join(sysCfg.EtcDir, sympiConfigFilename)`
`184`	`186`	`}`
`185`	`187`
`186`	`188`	`// LoadSingularityReleaseConf loads from the configuration file the list of supported`