fixed bug where modules with _ and - were not being parsed properly w…

…hen generating list of modules to copy into the initramfs
mykhaylo- · Mar 24, 2015 · ed0e44b · ed0e44b
1 parent 6b8728e
commit ed0e44b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+6.1.4
+------------
+- Fixed a bug where regex expressions conducted on modules with "-" or "_" in their name
+  to fail. This caused modules (i.e dm-crypt) with the affected characters that were added
+  to "Addon.py" to not be copied into the initramfs.
+
 6.1.3
 ------------
 - Relicensed to the Simplified BSD License

diff --git a/README b/README
@@ -1,4 +1,4 @@
-Bliss Initramfs Creator - v6.1.3
+Bliss Initramfs Creator - v6.1.4
 Jonathan Vasquez <[email protected]>
 Designed for Gentoo Linux
 

diff --git a/pkg/libs/Core.py b/pkg/libs/Core.py
@@ -435,7 +435,7 @@ def CopyModules(cls):
         # Get the dependencies for all the modules in our set
         for file in cls._modset:
             # Get only the name of the module
-            match = re.search('(?<=/)\w+.ko', file)
+            match = re.search('(?<=/)[a-zA-Z0-9_-]+.ko', file)
 
             if match:
                 sFile = match.group().split(".")[0]

diff --git a/pkg/libs/Variables.py b/pkg/libs/Variables.py
@@ -11,7 +11,7 @@
 author = "Jonathan Vasquez"
 email = "[email protected]"
 contact = author + " <" + email + ">"
-version = "6.1.3"
+version = "6.1.4"
 license = "Simplified BSD License"
 
 # Locations