commit dc208bb2bb40c546d9a662dd427f916a3562dc83
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 27 23:49:58 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 27 23:49:58 2018 +0000
tree b7e1a196f625836749efcae9a44f0d6eba9108ef
parent d56097dc273e4edd0df16cf8a20296a9ceb82e4a
parent edc934ccc935e96ec83dc9932e03d4b23578a155

Merge "Fix soong_zip printing warnings with --ignore_missing_files"

zip/zip.go

diff --git a/zip/zip.go b/zip/zip.go
index 774966a..1f5fe43 100644
--- a/zip/zip.go
+++ b/zip/zip.go
@@ -317,7 +317,7 @@
 					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 @@
 					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 @@
 					Err:  syscall.ENOTDIR,
 				}
 				if args.IgnoreMissingFiles {
-					fmt.Fprintln(args.Stderr, "warning:", err)
+					fmt.Fprintln(z.stderr, "warning:", err)
 				} else {
 					return err
 				}