StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix removing partial zip file on error

Browse Source 
Fix the shadowed err variable so that it is visible to the defer
function that removes the partial zip file on error.

Bug: 182761771
Test: manual
Change-Id: Ia67ac4bca5ef0107466edf25a76c74d70c243d3f
This commit is contained in:
Colin Cross
2021-03-15 15:28:40 -07:00
parent 05f72de083
commit 665b6786b8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zip/zip.go
View File

@@ -406,6 +406,8 @@ func Zip(args ZipArgs) error {
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
var out io.Writer = buf var out io.Writer = buf
var zipErr error
if !args.WriteIfChanged { if !args.WriteIfChanged {
f, err := os.Create(args.OutputFilePath) f, err := os.Create(args.OutputFilePath)
if err != nil { if err != nil {
@@ -414,7 +416,7 @@ func Zip(args ZipArgs) error {
defer f.Close() defer f.Close()
defer func() { defer func() {
if err != nil { if zipErr != nil {
os.Remove(args.OutputFilePath) os.Remove(args.OutputFilePath)
} }
}() }()
@@ -422,9 +424,9 @@ func Zip(args ZipArgs) error {
out = f out = f
} }
err := zipTo(args, out) zipErr = zipTo(args, out)
if err != nil { if zipErr != nil {
return err return zipErr
} }
if args.WriteIfChanged { if args.WriteIfChanged {