From a8c4e38edc1ccabbb3c993290c75d8c1dc83ffae Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Wed, 20 Jul 2011 16:11:15 +0400
Subject: [PATCH] Add printing version of fetching video drivers.

---
 pym/cl_assemble.py | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py
index 5ffac91..616e6dd 100644
--- a/pym/cl_assemble.py
+++ b/pym/cl_assemble.py
@@ -1412,11 +1412,11 @@ class cl_assemble(color_print):
         """Fetch propreitary drivers"""
         if self.clVars.Get('cl_assemble_withvideo_set') == "on":
             drivers = [
-                       ('nvidia-drivers 260.XX.XX',
+                       ('nvidia-drivers',
                         'x11-drivers/nvidia-drivers'),
-                       ('nvidia-drivers 173.XX.XX',
+                       ('nvidia-drivers',
                         '\\<x11-drivers/nvidia-drivers-174'),
-                       ('nvidia-drivers 96.XX.XX',
+                       ('nvidia-drivers',
                         '\\<x11-drivers/nvidia-drivers-97'),
                        ('ati-drivers',
                        'x11-drivers/ati-drivers')
@@ -1443,8 +1443,30 @@ class cl_assemble(color_print):
         while drivers:
             repeatDrivers = []
             for verName,drvVer in drivers:
+                checkprocess = self.runChroot(
+                            "emerge -p %s"%
+                            drvVer, raiseError=False,joinErr=True)
+                checkprocess = self.runChroot(
+                            "emerge -vp %s"%
+                            drvVer,raiseError=False,joinErr=True)
+                rePackage = re.compile("^\[ebuild[^\]]+]\s+(\S+)")
+                # get version from emerging nvidia-driver
+                nvidiaVersions = \
+                    map(lambda x:x.groups()[1],
+                    filter(lambda x:x,
+                    map(self.reVerSplit.search,
+                    map(lambda x:x.groups()[0],
+                    filter(lambda x:x,
+                    map(rePackage.search,
+                    filter(lambda x:verName in x,
+                    checkprocess)))))))
+
+                if nvidiaVersions:
+                    nvidiaVersions = nvidiaVersions[0]
+                else:
+                    nvidiaVersions = "0"
                 self.printMessageForTest(" " +
-                    _("Fetching %s")%verName)
+                    _("Fetching %s")%"%s-%s"%(verName,nvidiaVersions))
                 # run verbose package emergin for get version
                 fetchprocess = self.runChroot(
                             "emerge -f %s"%