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.

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index dc70de658553c8acd9d1e56d3c866352ab454f54..55fe9f0f6cdc25af8b3ef2cda133ece007a9ab7b 100644 (file)
--- 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 142f8806c7254ab614ecfeebb2639a5bbc669138..97b5f3f149be2261c1c85d414f63e1c43340eea8 100755 (executable)
--- 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 d200fe80d12533dff6ef144ffb75e746b2b169fb..c015e3a6c33911adc8a6b2ffaf1f111df8177a6e 100644 (file)
--- 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):
                """