From 569d369bd1438a04cb4f68f1a9ed5919429bfa3b Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Wed, 8 Sep 2010 12:03:59 +0400
Subject: [PATCH] Fix bug of specifing wrong device by '-d' option.

Fix vfat params.
---
 pym/cl_install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/cl_install.py b/pym/cl_install.py
index 6e25510..7627856 100644
--- a/pym/cl_install.py
+++ b/pym/cl_install.py
@@ -289,6 +289,7 @@ class convertDictOpt:
                                       "utf8":{"options":
                                       re.compile("0|1|no|false|true|yes"),
                                       "incompatible":["uni_xlate"]}},
+                              "incompatible":[],
                               "makefs":"/usr/sbin/mkfs.vfat"},
                       "xfs":{"options":["allocsize", "attr2", "noattr2",
                                         "barrier", "dmapi", "grpid",
@@ -808,7 +809,7 @@ class cl_install(color_print):
         # check specified devices
         wrongDevices = list(set(usedDevicesOnlyDisks) - \
                         set(self.clVars.Get('os_disk_dev')))
-        wrongDevices = list(set(usedDevicesOnlySwap) - \
+        wrongDevices = wrongDevices + list(set(usedDevicesOnlySwap) - \
                         set(self.clVars.Get('os_disk_dev')+["none"]))
         if wrongDevices:
             self.printERROR(_("Incorrect device '%s'")%wrongDevices[0])