Author: arkurth
Date: Mon Nov 12 14:28:49 2012
New Revision: 1408303
URL: http://svn.apache.org/viewvc?rev=1408303&view=rev
Log:
Merged revision(s) 1408302 from
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/libvirt.pm:
VCL-641
Fixed regex in get_domain_info to correctly parse the virsh output if there are
multiple spaces between the ID and name.
........
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/libvirt.pm
(contents, props changed)
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/libvirt.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/libvirt.pm?rev=1408303&r1=1408302&r2=1408303&view=diff
==============================================================================
---
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/libvirt.pm
(original)
+++
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/libvirt.pm
Mon Nov 12 14:28:49 2012
@@ -1779,7 +1779,7 @@ sub get_domain_info {
my $defined_domains = {};
my $domain_info_string = '';
for my $line (@$output) {
- my ($id, $name, $state) = $line =~
/^\s*([\d\-]+)\s(.+?)\s+(\w+|shut off)$/g;
+ my ($id, $name, $state) = $line =~
/^\s*([\d\-]+)\s+(.+?)\s+(\w+|shut off)$/g;
next if (!defined($id));
$defined_domains->{$name}{state} = $state;
Propchange:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/libvirt.pm
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 12 14:28:49 2012
@@ -0,0 +1 @@
+/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/libvirt.pm:1378995,1383454,1408302
