Ubuntu Pastebin

Paste from alberto at Mon, 5 Oct 2015 14:23:06 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
commit bbd7840a24eb0cc05f3db90ed960b940e86e467c
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 5 13:39:20 2015 +0200

    debian/xdiagnose.links: add links for the current nvidia packages

diff --git a/debian/xdiagnose.links b/debian/xdiagnose.links
index 8d41919..20a7be8 100644
--- a/debian/xdiagnose.links
+++ b/debian/xdiagnose.links
@@ -44,13 +44,12 @@ usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/sou
 usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_linux-restricted-modules-2.6.24.py
 usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_mesa.py
 usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_mesa-demos.py
-usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers.py
-usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-173.py
-usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-71.py
-usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-96.py
-usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-experimental-304.py
-usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-experimental-310.py
-usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-updates.py
+usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-352.py
+usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-340.py
+usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-304.py
+usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-352-updates.py
+usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-340-updates.py
+usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-304-updates.py
 usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_pixman.py
 usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_radeontool.py
 usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_wacom-tools.py

commit d56154cca8a1faffb776cb48c36e184c071da44f
Author: Alberto Milone <alberto.milone@canonical.com>
Date:   Mon Oct 5 13:37:30 2015 +0200

    apport/source_xorg.py: don't fail if no /proc/driver/nvidia is there
    
    The module might not be loaded. Also add a pattern for all the nvidia
    drivers.

diff --git a/apport/source_xorg.py b/apport/source_xorg.py
index 8c076fc..1f570fc 100755
--- a/apport/source_xorg.py
+++ b/apport/source_xorg.py
@@ -510,15 +510,15 @@ def attach_nvidia_info(report, ui=None):
     if nonfree_graphics_module() != 'nvidia':
         return
 
-    report['version.nvidia-graphics-drivers'] = package_versions("nvidia-graphics-drivers")
+    report['version.nvidia-graphics-drivers'] = package_versions("nvidia-graphics-drivers-*")
 
     for logfile in glob.glob('/proc/driver/nvidia/*'):
         if os.path.isfile(logfile):
-            attach_file(report, logfile)
+            attach_file_if_exists(report, logfile)
 
     for logfile in glob.glob('/proc/driver/nvidia/*/*'):
         if os.path.basename(logfile) != 'README':
-            attach_file(report, logfile)
+            attach_file_if_exists(report, logfile)
 
     if os.path.exists('/usr/bin/nvidia-bug-report.sh'):
         if (ui and (ui.yesno("Would you like to generate and attach an NVIDIA bug reporting file? (~/nvidia-bug-report.log.gz)") == True)):
Download as text