Build XCCDF only from module.ini and group.ini files

Previously building of module set has been corrupted when directory
with the module contained more than one file with the ".ini"
extentions. Build of the module set shouldn't be affected by various
INI files, that are not related to the module set structure.

So the scan is now read only group.ini and module.ini files whose
names are reserved for PA purposes. In addition we expect only one
of those files in each directory, so the ModuleSetFormatError
exception is raised when both are detected in the same directory.

- removed unused import of ModuleSetUtils

Resolves #310

preupg/settings.py

@@ -46,6 +46,7 @@
 # file with module set meta info
 properties_ini = "properties.ini"
 module_ini = "module.ini"
+group_ini = "group.ini"
 
 solution_txt = "solution.txt"
 check_script = "check"

preupg/xmlgen/oscap_group_xml.py

@@ -14,12 +14,12 @@
     import ConfigParser as configparser
 
 from preupg.xmlgen.xml_utils import XmlUtils
-from preupg.utils import FileHelper, ModuleSetUtils
+from preupg.utils import FileHelper
 try:
     from xml.etree import ElementTree
 except ImportError:
     from elementtree import ElementTree
-from preupg import settings
+from preupg import settings, exception
 
 try:
     from xml.etree.ElementTree import ParseError
@@ -56,9 +56,19 @@ def find_all_ini(self):
         self.loded dict:
         self.loaded[ini_file_path] = {option1: value, option2: value, ...}
         """
-        for dir_name in os.listdir(self.dirname):
-            if dir_name.endswith(".ini"):
-                self.lists.append(os.path.join(self.dirname, dir_name))
+        found = 0
+        for file_name in os.listdir(self.dirname):
+            if file_name not in [settings.module_ini, settings.group_ini]:
+                continue
+            if found == 0:
+                self.lists.append(os.path.join(self.dirname, file_name))
+                found = 1
+            else:
+                raise exception.ModuleSetFormatError(
+                        "Cannot prepare XCCDF for OpenSCAP",
+                        "group.ini and module.ini are in the same directory %s"
+                        % self.dirname
+                        )
         for file_name in self.lists:
             if FileHelper.check_file(file_name, "r") is False:
                 continue