Merge lp:~andrea.corbellini/ubuntu/raring/nvidia-common/detector-getData-fixes into lp:ubuntu/raring/nvidia-common

[Andrea Corbellini]

Unmerged revisions

64. By Andrea Corbellini on 2012-10-21

Do not fail with an exception if an nvidia package name cannot be parsed.

63. By Andrea Corbellini on 2012-10-21

Do not detect experimental nvidia packages.

=== modified file 'NvidiaDetector/nvidiadetector.py'
--- NvidiaDetector/nvidiadetector.py	2011-08-12 17:33:04 +0000
+++ NvidiaDetector/nvidiadetector.py	2012-10-21 09:15:25 +0000
@@ -133,7 +133,8 @@
 
         for package in apt.Cache():
             if (not package.name.startswith('nvidia-')
-                or 'updates' in package.name):
+                or 'updates' in package.name
+                or 'experimental' in package.name):
                 continue
             try:
                 m = package.candidate.record['Modaliases']
@@ -146,7 +147,11 @@
             # package names can be like "nvidia-173:i386" and we need to
             # extract the driver flavour from the name e.g. "173"
             stripped_package_name = package.name.split('-', 1)[1].split(':', 1)[0]
-            driver_version = self.__get_value_from_name(stripped_package_name)
+            try:
+                driver_version = self.__get_value_from_name(stripped_package_name)
+            except ValueError:
+                logging.error('Package name %s cannot be parsed' % package.name)
+                continue
 
             try:
                 for part in m.split(')'):
@@ -439,4 +444,3 @@
 
 #if __name__ == '__main__':
 #    main()
-