Skip to content

Commit

Permalink
F #3076: fix an issue when using pipe the method called was info, not…
Browse files Browse the repository at this point in the history
… infoextended (#3196)

(cherry picked from commit 5281803)
  • Loading branch information
Alejandro Huertas Herrero authored and rsmontero committed Apr 5, 2019
1 parent 48041e6 commit ae1007a
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/cli/one_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -672,11 +672,12 @@ def list_pool_table(table, pool, options, filter_flag)
# List pool in XML format, pagination is used in interactive output
#-----------------------------------------------------------------------
def list_pool_xml(pool, options, filter_flag)
extended = options.include?(:extended) && options[:extended]

if $stdout.isatty
size = $stdout.winsize[0] - 1

# ----------- First page, check if pager is needed -------------
extended = options.include?(:extended) && options[:extended]
rc = pool.get_page(size, 0, extended)
ps = ""

Expand Down Expand Up @@ -724,7 +725,11 @@ def list_pool_xml(pool, options, filter_flag)

stop_pager(ppid)
else
rc = pool.info
if pool.pool_name == "VM_POOL" && extended
rc = pool.info_all_extended
else
rc = pool.info
end

return -1, rc.message if OpenNebula.is_error?(rc)

Expand Down

0 comments on commit ae1007a

Please sign in to comment.