[systemimager-commits] r4393 - trunk/lib/SystemImager

[<ar...@sy...>]

Author: arighi
Date: 2008-02-23 11:52:17 -0600 (Sat, 23 Feb 2008)
New Revision: 4393

Modified:
   trunk/lib/SystemImager/UseYourOwnKernel.pm
Log:
- properly detect UYOK kernel version also when the build string contains the
  the build date in the yyyy/mm/dd format

The kernel in openSuSE 10.3 uses this format.

Bug reported by: Jes?\195?\186s S?\195?\161nchez Gonz?\195?\161lez <jes...@ir...>


Modified: trunk/lib/SystemImager/UseYourOwnKernel.pm
===================================================================
--- trunk/lib/SystemImager/UseYourOwnKernel.pm	2008-02-21 14:59:39 UTC (rev 4392)
+++ trunk/lib/SystemImager/UseYourOwnKernel.pm	2008-02-23 17:52:17 UTC (rev 4393)
@@ -457,8 +457,20 @@
                 #       2.4.24 (root@mantis) #2 Fri Jan 16 19:51:43 CST 2004^
                 #       2.4.19-mantis-2002.11.20 (root@mantis) #6 Tue Nov 19 15:15:43 CST 2002
                 #       2.6.7-1-686 (dil...@to...) #1 Thu Jul 8 05:36:53 EDT 2004
+                #       2.6.22.5-31-default (geeko@buildhost) #1 SMP 2007/09/21 22:29:00 UTC
                 #
-                my $regex = '(2\.[46]\.\d[^\/]*?) \(.*@.*\) [#]\d+.*\w{3} \w{3} \d{1,2} \d{2}:\d{2}:\d{2} \w{3,4} \d{4}';
+                my $regex =
+                #           | kernel version + build machine
+                #           `---------------------------------------
+                            '(2\.[46]\.\d[^\/]*?) \(.*@.*\) [#]\d+.*' .
+                #
+                #           | build date
+                #           `---------------------------------------
+                            '(\w{3} \w{3} \d{1,2}|\d{4}\/\d{2}\/\d{2}) '.
+                #
+                #           | build time
+                #           `---------------------------------------
+                            '\d{2}:\d{2}:\d{2} \w{3,4}( \d{4})?';
                 while(<IN>) {
                        # extract the `uname -r` string from the kernel file
                        if(m/$regex/o) {