Check for missing vg declaration earlier so the error message makes

sense (bz 176989).

2 files changed, 4 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 97356c707..52be0f52a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* isys/isys.py (hardDriveDict): don't put removable drives in the isys
 	hard drive list (#147504)
+	* kickstart.py (KickstartBase.defineLogicalVolume): Check for missing
+	vg declaration earlier so the error message makes sense (#176989).
 
 2006-02-17  Peter Jones  <pjones@redhat.com>
 
diff --git a/kickstart.py b/kickstart.py
index aec407c76..b1fbd47f5 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -1001,6 +1001,8 @@ class KickstartBase(BaseInstallClass):
 
         if not name:
             raise KickstartError, "Must specify a logical volume name"
+        if not self.ksVGMapping.has_key(vgname):
+            raise KickstartValueError, "Logical volume specifies a non-existent volume group"
 
         vgid = self.ksVGMapping[vgname]
 	for areq in id.partitions.autoPartitionRequests:
@@ -1008,9 +1010,6 @@ class KickstartBase(BaseInstallClass):
 		if areq.volumeGroup == vgid and areq.logicalVolumeName == name:
 		    raise KickstartValueError, "Logical volume name %s already used in volume group %s" % (name,vgname)
 
-        if not self.ksVGMapping.has_key(vgname):
-            raise KickstartValueError, "Logical volume specifies a non-existent volume group"
-
         request = partRequests.LogicalVolumeRequestSpec(filesystem,
                                                         format = format,
                                                         mountpoint = mountpoint,