diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-10-07 07:32:28 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-10-07 07:32:28 +0200 |
| commit | ae17d89347d2c9a604ccc984fb9f83c79e789162 (patch) | |
| tree | 665e0d8bbda0cee5e70b0d17c1e4b7cf6c7aebae /bin | |
| parent | da242e25372a16334b9babfad2868feb78f9a529 (diff) | |
| download | portage-ae17d89347d2c9a604ccc984fb9f83c79e789162.tar.gz portage-ae17d89347d2c9a604ccc984fb9f83c79e789162.tar.bz2 portage-ae17d89347d2c9a604ccc984fb9f83c79e789162.zip | |
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.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/phase-helpers.sh | 18 | ||||
| -rwxr-xr-x | bin/portageq | 4 |
2 files changed, 18 insertions, 4 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 = [] |