From 489ebf01a26cbe84a27ccdabdd59a2770ab391d1 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Tue, 15 Jun 2021 13:19:52 +0200 Subject: [PATCH] use sudo for git clean; be more verbose when clean fails --- main.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 0cbe8ed..c4f1c23 100644 --- a/main.go +++ b/main.go @@ -219,9 +219,13 @@ func increasePkgRel(pkg *BuildPackage) { } func gitClean(pkg *BuildPackage) { - cmd := backgroundCmd("sh", "-c", "cd "+filepath.Dir(pkg.Pkgbuild)+"&&git clean -xdff") + cmd := backgroundCmd("sudo", "git clean -xff "+filepath.Dir(pkg.Pkgbuild)) res, err := cmd.CombinedOutput() - log.Debug(string(res)) + if err != nil { + log.Warningf("git clean failed with %v:\n%s", err, res) + } else { + log.Debug(string(res)) + } check(err) } @@ -583,7 +587,7 @@ func (b *BuildManager) syncWorker() { log.Debug(string(res)) check(err) } else if err == nil { - cmd := backgroundCmd("sh", "-c", "cd "+gitPath+" && git clean -xdff") + cmd := backgroundCmd("sudo", "git clean -xff "+gitPath) res, err := cmd.CombinedOutput() log.Debug(string(res)) check(err)