riyyi/declpac
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dont use CombinedOutput() to capture error separately

Browse Source
This commit is contained in:
AI Bot
2026-04-18 15:07:56 +02:00
committed by Riyyi
parent 82aeceacac
commit bd1108a93f
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/pacman/pacman.go
+13 -23
View File
@@ -5,7 +5,6 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"regexp"
"strings" "strings"
"time" "time"
@@ -96,7 +95,7 @@ func Sync(packages []string) (*output.Result, error) {
if len(pacmanPkgs) > 0 { if len(pacmanPkgs) > 0 {
fmt.Fprintf(os.Stderr, "[debug] Sync: syncing %d pacman packages...\n", len(pacmanPkgs)) fmt.Fprintf(os.Stderr, "[debug] Sync: syncing %d pacman packages...\n", len(pacmanPkgs))
_, err = SyncPackages(pacmanPkgs) err = SyncPackages(pacmanPkgs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -263,28 +262,22 @@ func getInstalledCount() (int, error) {
return count, nil return count, nil
} }
func SyncPackages(packages []string) (int, error) { func SyncPackages(packages []string) error {
start := time.Now() start := time.Now()
fmt.Fprintf(os.Stderr, "[debug] SyncPackages: starting...\n") fmt.Fprintf(os.Stderr, "[debug] SyncPackages: starting...\n")
args := append([]string{"-S", "--needed"}, packages...) args := append([]string{"-S", "--needed"}, packages...)
cmd := exec.Command("pacman", args...) cmd := exec.Command("pacman", args...)
output, err := cmd.CombinedOutput() cmd.Stdout = state.GetLogWriter()
cmd.Stderr = state.GetLogWriter()
err := cmd.Run()
if err != nil { if err != nil {
errMsg := fmt.Sprintf("pacman sync failed: %s", output) state.Write([]byte(fmt.Sprintf("pacman sync failed: %v\n", err)))
state.Write([]byte(errMsg)) return fmt.Errorf("pacman sync failed: %v", err)
return 0, fmt.Errorf("pacman sync failed: %s", output)
} }
if len(output) > 0 {
state.Write(output)
}
re := regexp.MustCompile(`upgrading (\S+)`)
matches := re.FindAllStringSubmatch(string(output), -1)
fmt.Fprintf(os.Stderr, "[debug] SyncPackages: done (%.2fs)\n", time.Since(start).Seconds()) fmt.Fprintf(os.Stderr, "[debug] SyncPackages: done (%.2fs)\n", time.Since(start).Seconds())
return len(matches), nil return nil
} }
func CleanupOrphans() (int, error) { func CleanupOrphans() (int, error) {
@@ -304,15 +297,12 @@ func CleanupOrphans() (int, error) {
} }
removeCmd := exec.Command("pacman", "-Rns") removeCmd := exec.Command("pacman", "-Rns")
output, err := removeCmd.CombinedOutput() removeCmd.Stdout = state.GetLogWriter()
removeCmd.Stderr = state.GetLogWriter()
err = removeCmd.Run()
if err != nil { if err != nil {
errMsg := fmt.Sprintf("%s: %s", err, output) state.Write([]byte(fmt.Sprintf("cleanup orphans failed: %v\n", err)))
state.Write([]byte(errMsg)) return 0, fmt.Errorf("cleanup orphans failed: %v", err)
return 0, fmt.Errorf("%s: %s", err, output)
}
if len(output) > 0 {
state.Write(output)
} }
count := len(orphans) count := len(orphans)