mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-23 05:04:56 +09:00
1 parent
6fdb06c646
commit
ab767a74aa
1 file changed
+16
-3
+16
-3
@@ -191,7 +191,7 @@ EOT
|
||||
:format => Integer,
|
||||
:description => 'The Group ID to instantiate the VM'
|
||||
}
|
||||
|
||||
|
||||
#NOTE: Other options defined using this array, add new options at the end
|
||||
TEMPLATE_OPTIONS=[
|
||||
{
|
||||
@@ -674,7 +674,7 @@ EOT
|
||||
def list_pool_xml(pool, options, filter_flag)
|
||||
extended = options.include?(:extended) && options[:extended]
|
||||
|
||||
if $stdout.isatty
|
||||
if $stdout.isatty and (!options.key?:no_pager)
|
||||
size = $stdout.winsize[0] - 1
|
||||
|
||||
# ----------- First page, check if pager is needed -------------
|
||||
@@ -702,6 +702,13 @@ EOT
|
||||
return 0
|
||||
end
|
||||
|
||||
if elements < size
|
||||
return 0
|
||||
elsif !pool.is_paginated?
|
||||
stop_pager(ppid)
|
||||
return 0
|
||||
end
|
||||
|
||||
# ------- Rest of the pages in the pool, piped to pager --------
|
||||
current = size
|
||||
|
||||
@@ -712,6 +719,12 @@ EOT
|
||||
|
||||
current += size
|
||||
|
||||
begin
|
||||
Process.waitpid(ppid, Process::WNOHANG)
|
||||
rescue Errno::ECHILD
|
||||
break
|
||||
end
|
||||
|
||||
elements, page = print_page(pool, options)
|
||||
|
||||
puts page
|
||||
@@ -1061,7 +1074,7 @@ EOT
|
||||
end
|
||||
end
|
||||
|
||||
def OpenNebulaHelper.time_to_str(time, print_seconds=true,
|
||||
def OpenNebulaHelper.time_to_str(time, print_seconds=true,
|
||||
print_hours=true, print_years=false)
|
||||
|
||||
value = time.to_i
|
||||
|
||||
Reference in new issue
Block a user