devtools/madb: do not warn when the nickname file does not exist.
Change-Id: I8900aa5552b91d9dfefd9f3270094134799cf0f1
diff --git a/madb.go b/madb.go
index 5ac472c..5542a84 100644
--- a/madb.go
+++ b/madb.go
@@ -116,7 +116,7 @@
nsm, err := readNicknameSerialMap(nicknameFile)
if err != nil {
- fmt.Fprintln(os.Stderr, "Warning: Could not read the nickname file.")
+ return nil, err
}
return parseDevicesOutput(output, nsm)
diff --git a/name.go b/name.go
index 8b2542d..1957629 100644
--- a/name.go
+++ b/name.go
@@ -224,6 +224,11 @@
f, err := os.Open(filename)
if err != nil {
+ // Nickname file may not exist when there are no nicknames assigned, and it is not an error.
+ if os.IsNotExist(err) {
+ return nil, nil
+ }
+
return nil, err
}
defer f.Close()
