Edited code from previous commit to exclude try-except block

Edited code, from previous commit that allowed -S to download kernel
versions of the form x.y, to use an improved regular expression
and remove an unecessary try/except block

Signed-off-by: Anubhav Shelat <ashelat@redhat.com>
- Modified comment
Signed-off-by: John Kacur <jkacur@redhat.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/rteval-cmd b/rteval-cmd
index 1f2ea08..635606e 100755
--- a/rteval-cmd
+++ b/rteval-cmd
@@ -306,11 +306,7 @@ if __name__ == '__main__':
                 kernel_prefix = re.search(r"\d{1,2}\.\d{1,3}\-[a-z]*\d{1,2}", rtevcfg.srcdownload).group(0)
                 url = "https://git.kernel.org/torvalds/t/"
             else:
-                try:
-                    kernel_prefix = re.search(r"\d{1,2}\.\d{1,3}\.*\d{1,2}", rtevcfg.srcdownload).group(0)
-                except AttributeError:
-                    # if kernel version specified is of the form x.x and not x.x.x
-                    kernel_prefix = re.search(r"\d{1,2}\.\d{1,3}", rtevcfg.srcdownload).group(0)
+                kernel_prefix = re.search(r"(\d{1,2}\.\d{1,3}\.\d{1,3})|(\d{1,2}\.\d{1,3})", rtevcfg.srcdownload).group(0)
                 major_version = re.search(r"\d{1,2}", kernel_prefix).group(0)
                 url = "https://kernel.org/pub/linux/kernel/v" + major_version + ".x/"