From a17fa845d74d17bf6d466f84fd9d3c5602669e53 Mon Sep 17 00:00:00 2001
From: Alberto Donizetti <alb.donizetti@gmail.com>
Date: Thu, 18 Feb 2016 21:13:42 +0100
Subject: [PATCH] go/gcimporter15: add missing argument to error message

Backport of Change 19641

Change-Id: Ic386cc8ecc006a2cd96c5ac3ff00f3d314873fd3
Reviewed-on: https://go-review.googlesource.com/19643
Reviewed-by: Robert Griesemer <gri@golang.org>
---
 go/gcimporter15/gcimporter.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go/gcimporter15/gcimporter.go b/go/gcimporter15/gcimporter.go
index 7b19b081..123d5d6f 100644
--- a/go/gcimporter15/gcimporter.go
+++ b/go/gcimporter15/gcimporter.go
@@ -396,7 +396,7 @@ func (p *parser) getPkg(id, name string) *types.Package {
 		if pname := pkg.Name(); pname == "" {
 			setName(pkg, name)
 		} else if pname != name {
-			p.errorf("%s package name mismatch: %s (given) vs %s (expected)", pname, name)
+			p.errorf("%s package name mismatch: %s (given) vs %s (expected)", id, pname, name)
 		}
 	}
 	return pkg