mirror of
https://github.com/danog/gllvm.git
synced 2024-12-02 11:17:47 +01:00
issue #31 plus continued race detection stuff, II.
This commit is contained in:
parent
fc48468746
commit
a8305d0094
@ -321,9 +321,9 @@ func listArchiveFiles(ea extractionArgs, inputFile string) (contents []string) {
|
|||||||
var arArgs []string
|
var arArgs []string
|
||||||
arArgs = append(arArgs, "-t")
|
arArgs = append(arArgs, "-t")
|
||||||
arArgs = append(arArgs, inputFile)
|
arArgs = append(arArgs, inputFile)
|
||||||
output, err := runCmd("ar", arArgs)
|
output, err := runCmd(ea.ArchiverName, arArgs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
LogWarning("ar command: ar %v", arArgs)
|
LogWarning("ar command: %v %v", ea.ArchiverName, arArgs)
|
||||||
LogFatal("Failed to extract contents from archive %s because: %v.\n", inputFile, err)
|
LogFatal("Failed to extract contents from archive %s because: %v.\n", inputFile, err)
|
||||||
}
|
}
|
||||||
contents = strings.Split(output, "\n")
|
contents = strings.Split(output, "\n")
|
||||||
@ -344,9 +344,9 @@ func extractFile(ea extractionArgs, archive string, filename string, instance in
|
|||||||
}
|
}
|
||||||
arArgs = append(arArgs, archive)
|
arArgs = append(arArgs, archive)
|
||||||
arArgs = append(arArgs, filename)
|
arArgs = append(arArgs, filename)
|
||||||
_, err := runCmd("ar", arArgs)
|
_, err := runCmd(ea.ArchiverName, arArgs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
LogWarning("Failed to extract instance %v of %v from archive %s because: %v.\n", instance, filename, archive, err)
|
LogWarning("The archiver %v failed to extract instance %v of %v from archive %s because: %v.\n", ea.ArchiverName, instance, filename, archive, err)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
|
Loading…
Reference in New Issue
Block a user