best_version() and has_version(): Improve die() messages.

- Print different die() message for invalid atoms.
- Mention ebuild-ipc instead of portageq in other die() messages when
  ebuild-ipc is actually used.

3 files changed, 20 insertions, 6 deletions

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index dc70de658..55fe9f0f6 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -671,8 +671,15 @@ has_version() {
 		0|1)
 			return ${retval}
 			;;
+		2)
+			die "${FUNCNAME[0]}: invalid atom: ${atom}"
+			;;
 		*)
-			die "unexpected portageq exit code: ${retval}"
+			if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+				die "${FUNCNAME[0]}: unexpected ebuild-ipc exit code: ${retval}"
+			else
+				die "${FUNCNAME[0]}: unexpected portageq exit code: ${retval}"
+			fi
 			;;
 	esac
 }
@@ -717,8 +724,15 @@ best_version() {
 		0|1)
 			return ${retval}
 			;;
+		2)
+			die "${FUNCNAME[0]}: invalid atom: ${atom}"
+			;;
 		*)
-			die "unexpected portageq exit code: ${retval}"
+			if [[ -n ${PORTAGE_IPC_DAEMON} ]]; then
+				die "${FUNCNAME[0]}: unexpected ebuild-ipc exit code: ${retval}"
+			else
+				die "${FUNCNAME[0]}: unexpected portageq exit code: ${retval}"
+			fi
 			;;
 	esac
 }
diff --git a/bin/portageq b/bin/portageq
index 142f8806c..97b5f3f14 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -81,7 +81,7 @@ def has_version(argv):
 	"""
 	if (len(argv) < 2):
 		print("ERROR: insufficient parameters!")
-		return 2
+		return 3
 
 	warnings = []
 
@@ -129,7 +129,7 @@ def best_version(argv):
 	"""
 	if (len(argv) < 2):
 		print("ERROR: insufficient parameters!")
-		return 2
+		return 3
 
 	warnings = []
 
diff --git a/pym/portage/package/ebuild/_ipc/QueryCommand.py b/pym/portage/package/ebuild/_ipc/QueryCommand.py
index d200fe80d..c015e3a6c 100644
--- a/pym/portage/package/ebuild/_ipc/QueryCommand.py
+++ b/pym/portage/package/ebuild/_ipc/QueryCommand.py
@@ -66,7 +66,7 @@ class QueryCommand(IpcCommand):
 
 		root = normalize_path(root).rstrip(os.path.sep) + os.path.sep
 		if root not in db:
-			return ('', 'invalid ROOT: %s\n' % root, 2)
+			return ('', 'invalid ROOT: %s\n' % root, 3)
 
 		vardb = db[root]["vartree"].dbapi
 
@@ -80,7 +80,7 @@ class QueryCommand(IpcCommand):
 			m = best(vardb.match(atom))
 			return ('%s\n' % m, warnings_str, 0)
 		else:
-			return ('', 'invalid command: %s\n' % cmd, 2)
+			return ('', 'invalid command: %s\n' % cmd, 3)
 
 	def _elog(self, elog_funcname, lines):
 		"""