From b5a35b441107c40e53584cf655dd558a05f40e79 Mon Sep 17 00:00:00 2001
From: Sergio Campama <kaipi@google.com>
Date: Thu, 3 Mar 2016 16:45:15 -0300
Subject: [PATCH] Adds more information to Objective C error when the expected
 objc_class_prefix option is missing.

---
 src/google/protobuf/compiler/objectivec/objectivec_helpers.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
index 77a378c8f0..3e7ccb43d3 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
+++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
@@ -968,7 +968,8 @@ bool ValidateObjCClassPrefix(const FileDescriptor* file,
     } else {
       // ...it didn't match!
       *out_error = "error: Expected 'option objc_class_prefix = \"" +
-                   package_match->second + "\";' in '" + file->name() + "'";
+                   package_match->second + "\";' for package '" + package +
+                   "' in '" + file->name() + "'";
       if (prefix.length()) {
         *out_error += "; but found '" + prefix + "' instead";
       }