Skip to content

Commit

Permalink
Merge branch 'tickets/next/6795' of git://jet.mox.net/~tmz/facter int…
Browse files Browse the repository at this point in the history
…o next

* 'tickets/next/6795' of git://jet.mox.net/~tmz/facter:
  (#6795) xendomains: Ignore error output from xm list
  • Loading branch information
jhelwig committed Mar 21, 2011
2 parents b82635b + def3322 commit f7a87db
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/facter/util/xendomains.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
module Facter::Util::Xendomains
def self.get_domains
if xm_list = Facter::Util::Resolution.exec('/usr/sbin/xm list')
if xm_list = Facter::Util::Resolution.exec('/usr/sbin/xm list 2>/dev/null')
domains = xm_list.split("\n").reject { |line| line =~ /^(Name|Domain-0)/ }
domains.map { |line| line.split(/\s/)[0] }.join(',')
end
Expand Down

0 comments on commit f7a87db

Please sign in to comment.