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

Fix soong_zip printing warnings with --ignore_missing_files

Browse Source 
We weren't defaulting args.Stderr to os.Stderr, so we had been calling
fmt.Fprintln with `nil`.

Test: soong_zip --ignore_missing_files -C test/ -f abc -o test.zip
Change-Id: I0421f4bfb07fa36edf86c68ffc847995777c8221
This commit is contained in:
Dan Willemsen
2018-12-27 12:41:25 -08:00
parent 9e4c07a92f
commit edc934ccc9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zip/zip.go
View File

@@ -317,7 +317,7 @@ func ZipTo(args ZipArgs, w io.Writer) error {
Err: os.ErrNotExist,
}
if args.IgnoreMissingFiles {
fmt.Fprintln(args.Stderr, "warning:", err)
fmt.Fprintln(z.stderr, "warning:", err)
} else {
return err
}
@@ -334,7 +334,7 @@ func ZipTo(args ZipArgs, w io.Writer) error {
Err: os.ErrNotExist,
}
if args.IgnoreMissingFiles {
fmt.Fprintln(args.Stderr, "warning:", err)
fmt.Fprintln(z.stderr, "warning:", err)
} else {
return err
}
@@ -345,7 +345,7 @@ func ZipTo(args ZipArgs, w io.Writer) error {
Err: syscall.ENOTDIR,
}
if args.IgnoreMissingFiles {
fmt.Fprintln(args.Stderr, "warning:", err)
fmt.Fprintln(z.stderr, "warning:", err)
} else {
return err
}