actions/cache-apt-pkgs-action
1
0
Fork 0
mirror of https://github.com/awalsh128/cache-apt-pkgs-action.git synced 2025-09-20 01:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Be more tolerant of apt-cache warnings.

Browse source
This commit is contained in:
Andrew Walsh 2023-11-26 21:08:43 -08:00
parent 45e4578f79
commit 19a0253e65
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apt_query.go
View file

@ -65,7 +65,7 @@ func getPackages(names []string) AptPackages {
pkg.Name = strings.TrimSpace(strings.Split(line, ":")[1]) pkg.Name = strings.TrimSpace(strings.Split(line, ":")[1])
} else if strings.HasPrefix(line, "Version: ") { } else if strings.HasPrefix(line, "Version: ") {
pkg.Version = strings.TrimSpace(strings.Split(line, ":")[1]) pkg.Version = strings.TrimSpace(strings.Split(line, ":")[1])
} else if strings.HasPrefix(line, "N: ") || strings.HasPrefix(line, "E: ") { } else if strings.HasPrefix(line, "N: Unable to locate package ") || strings.HasPrefix(line, "E: ") {
if !contains(errorMessages, line) { if !contains(errorMessages, line) {
errorMessages = append(errorMessages, line) errorMessages = append(errorMessages, line)
} }

3
apt_query_test.go
View file

@ -28,6 +28,9 @@ func (r *RunResult) expectSuccessfulOut(expected string) {
r.TestContext.Errorf("Error running command: %v", r.Err) r.TestContext.Errorf("Error running command: %v", r.Err)
return return
} }
if r.Stderr != "" {
r.TestContext.Errorf("Unexpected stderr messages found.\nExpected: none\nActual:\n'%s'", r.Stderr)
}
if r.Stdout != expected+"\n" { // Output will always have a end of output newline. if r.Stdout != expected+"\n" { // Output will always have a end of output newline.
r.TestContext.Errorf("Unexpected stdout found.\nExpected:\n'%s'\nActual:\n'%s'", expected, r.Stdout) r.TestContext.Errorf("Unexpected stdout found.\nExpected:\n'%s'\nActual:\n'%s'", expected, r.Stdout)
} }