Merge pull request #78 from joereuss12/remove-cvmfs-shortcut-branch

cmd/object_copy.go

@@ -38,7 +38,7 @@ func init() {
 		flagSet.Bool("closest", false, "Return the closest cache and exit")
 		flagSet.BoolP("debug", "d", false, "Enable debug logs") // Typically set by the root command (which doesn't exist in stashcp mode)
 		flagSet.Bool("list-names", false, "Return the names of pre-configured cache lists and exit")
-		flagSet.String("methods", "cvmfs,http", "Comma separated list of methods to try, in order")
+		flagSet.String("methods", "http", "Comma separated list of methods to try, in order")
 		flagSet.Bool("namespaces", false, "Print the namespace information and exit")
 		flagSet.Bool("plugininterface", false, "Output in HTCondor plugin format.  Turned on if executable is named stash_plugin")
 		flagSet.Lookup("plugininterface").Hidden = true // This has been a no-op for quite some time.

cmd/plugin.go

@@ -61,7 +61,7 @@ func stashPluginMain(args []string) {
 	pelican.ObjectClientOptions.ProgressBars = false
 	pelican.ObjectClientOptions.Version = version
 	setLogging(log.PanicLevel)
-	methods := []string{"cvmfs", "http"}
+	methods := []string{"http"}
 	var infile, outfile, testCachePath string
 	var useOutFile bool = false
 	var getCaches bool = false

main.go

@@ -507,17 +507,6 @@ Loop:
 	for _, method := range methods {
 
 		switch method {
-		case "cvmfs":
-			if strings.HasPrefix(sourceFile, "/osgconnect/") {
-				log.Info("Trying CVMFS...")
-				if downloaded, err = download_cvmfs(sourceFile, destination, &payload); err == nil {
-					success = true
-					break Loop
-					//check if break still works
-				}
-			} else {
-				log.Debug("Skipping CVMFS as file does not start with /osgconnect/")
-			}
 		case "http":
 			log.Info("Trying HTTP...")
 			if downloaded, err = download_http(sourceFile, destination, &payload, ns, recursive, token_name, OSDFDirectorUrl); err == nil {