Make path determination more resilient w.r.t. including pipeline id or not

Author: alopezz

components/datadog/agent/package.go

@@ -57,11 +57,14 @@ func GetPackagePath(localPath string, flavor tifos.Flavor, agentFlavor string, a
 	packagePath := localPath
 	matches := []string{}
 	if pathInfo.IsDir() {
-		packagePath = path.Join(packagePath, subFolder)
-		packagePath = path.Join(packagePath, "pkg")
-		if flavor == tifos.WindowsServer {
-			packagePath = path.Join(packagePath, "pipeline-"+pipelineID)
+		packagePath = path.Join(packagePath, subFolder, "pkg")
+
+		// If a dedicated pipeline-identified folder is available, use that
+		packagePathWithPipelineID := path.Join(packagePath, "pipeline-"+pipelineID)
+		if info, err := os.Stat(packagePathWithPipelineID); err == nil && info.IsDir() {
+			packagePath = packagePathWithPipelineID
 		}
+
 		entries, err := os.ReadDir(packagePath)
 		if err != nil {
 			return "", err