From dcd2279bdd51466ac77fc85a1e78ecc79732859d Mon Sep 17 00:00:00 2001
From: Joe Rafaniello <jrafanie@redhat.com>
Date: Mon, 26 Aug 2013 17:48:11 -0400
Subject: [PATCH] Strip leading whitespace of each line from pvdisplay and
 friends.

---
 lib/linux_admin/volume.rb       | 2 +-
 lib/linux_admin/volume_group.rb | 4 ++--
 spec/logical_volume_spec.rb     | 6 +++---
 spec/physical_volume_spec.rb    | 4 ++--
 spec/volume_group_spec.rb       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/linux_admin/volume.rb b/lib/linux_admin/volume.rb
index 2c1adcd..2d5d0eb 100644
--- a/lib/linux_admin/volume.rb
+++ b/lib/linux_admin/volume.rb
@@ -23,7 +23,7 @@ def self.scan_volumes(cmd)
       out = run!(cmd, :params => { '-c' => nil}).output
 
       out.each_line do |line|
-        fields, vg = process_volume_display_line(line)
+        fields, vg = process_volume_display_line(line.lstrip)
         volumes << yield(fields, vg)
       end
 
diff --git a/lib/linux_admin/volume_group.rb b/lib/linux_admin/volume_group.rb
index 7412c9d..3567a27 100644
--- a/lib/linux_admin/volume_group.rb
+++ b/lib/linux_admin/volume_group.rb
@@ -60,8 +60,8 @@ def self.scan
         out = run!(cmd(:vgdisplay), :params => { '-c' => nil}).output
 
         out.each_line do |line|
-          fields = line.split(':')
-          vgs << VolumeGroup.new(:name   => fields[0])
+          fields = line.lstrip.split(':')
+          vgs << VolumeGroup.new(:name => fields[0])
         end
 
         vgs
diff --git a/spec/logical_volume_spec.rb b/spec/logical_volume_spec.rb
index 7c60bef..751afec 100644
--- a/spec/logical_volume_spec.rb
+++ b/spec/logical_volume_spec.rb
@@ -5,12 +5,12 @@
     LinuxAdmin::Distro.stub(:local => LinuxAdmin::Distros::Test.new)
 
     @logical_volumes = <<eos
-/dev/vg_foobar/lv_swap:vg_foobar:3:1:-1:2:4128768:63:-1:0:-1:253:0
-/dev/vg_foobar/lv_root:vg_foobar:3:1:-1:1:19988480:305:-1:0:-1:253:1
+  /dev/vg_foobar/lv_swap:vg_foobar:3:1:-1:2:4128768:63:-1:0:-1:253:0
+  /dev/vg_foobar/lv_root:vg_foobar:3:1:-1:1:19988480:305:-1:0:-1:253:1
 eos
 
     @groups = <<eos
-vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
+  vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
 eos
   end
 
diff --git a/spec/physical_volume_spec.rb b/spec/physical_volume_spec.rb
index 9d40b05..9926755 100644
--- a/spec/physical_volume_spec.rb
+++ b/spec/physical_volume_spec.rb
@@ -5,11 +5,11 @@
     LinuxAdmin::Distro.stub(:local => LinuxAdmin::Distros::Test.new)
 
     @physical_volumes = <<eos
-/dev/vda2:vg_foobar:24139776:-1:8:8:-1:32768:368:0:368:pxR32D-YkC2-PfHe-zOwb-eaGD-9Ar0-mAOl9u
+  /dev/vda2:vg_foobar:24139776:-1:8:8:-1:32768:368:0:368:pxR32D-YkC2-PfHe-zOwb-eaGD-9Ar0-mAOl9u
 eos
 
     @groups = <<eos
-vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
+  vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
 eos
   end
 
diff --git a/spec/volume_group_spec.rb b/spec/volume_group_spec.rb
index fd3a079..447e54b 100644
--- a/spec/volume_group_spec.rb
+++ b/spec/volume_group_spec.rb
@@ -5,7 +5,7 @@
     LinuxAdmin::Distro.stub(:local => LinuxAdmin::Distros::Test.new)
 
     @groups = <<eos
-vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
+  vg_foobar:r/w:772:-1:0:2:2:-1:0:1:1:12058624:32768:368:368:0:tILZUF-IspH-H90I-pT5j-vVFl-b76L-zWx3CW
 eos
   end