debian/apport/source_xorg.py | 22 ++++++++++++++++++++++ debian/changelog | 9 +++++++++ 2 files changed, 31 insertions(+)
New commits: commit 6af36d94877b8fc5f87fa687782a32ded61eaf8d Author: Christopher James Halse Rogers <[email protected]> Date: Tue Jun 15 15:12:44 2010 +1000 apport: Detect a previous manual install of the nvidia.com drivers. Attach the needed information for upstreaming nvidia bugs diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py index 4916078..b739865 100644 --- a/debian/apport/source_xorg.py +++ b/debian/apport/source_xorg.py @@ -73,6 +73,28 @@ def add_info(report, ui): report['UnreportableReason'] = _('VMware is installed. If you upgraded recently be sure to upgrade vmware to a compatible version.') return + if os.path.exists('/var/log/nvidia-installer.log'): + # User has installed nVidia drivers manually at some point. + # This is likely to have caused problems. + if not ui.yesno("""It appears you may have installed the nVidia drivers manually from nvidia.com. This can cause problems with the Ubuntu-supplied drivers. + +If you have not already uninstalled the drivers downloaded from nvidia.com, please uninstall them and reinstall the Ubuntu packages before filing a bug with Ubuntu. + +Have you uninstalled the drivers from nvidia.com?"""): + report['UnreportableReason'] = 'The drivers from nvidia.com are not supported by Ubuntu. Please uninstall them and test whether your problem still occurs.' + return + attach_file(report, '/var/log/nvidia-installer.log', 'nvidia-installer.log') + tags.append('possible-manual-nvidia-install') + + if nonfree_graphics_module() == 'nvidia': + # Attach information for upstreaming nvidia binary bugs + for logfile in glob.glob('/proc/driver/nvidia/*'): + if os.path.isfile(logfile): + attach_file(report, logfile) + for logfile in glob.glob('/proc/driver/nvidia/*/*'): + if os.path.basename(logfile) != 'README': + attach_file(report, logfile) + if report['ProblemType'] == 'Crash' and 'Traceback' not in report: nonfree_driver = nonfree_graphics_module() if (nonfree_driver == "fglrx"): diff --git a/debian/changelog b/debian/changelog index 7b6b821..72fca03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xorg (1:7.5+6ubuntu2) maverick; urgency=low + + * debian/apport/source_xorg.py: + + Detect a previous manual install of the nvidia.com drivers, and ask the + user if they have uninstalled them. + + Attach the neccesary information for upstreaming nvidia binary bugs. + + -- Christopher James Halse Rogers <[email protected]> Tue, 15 Jun 2010 15:14:16 +1000 + xorg (1:7.5+6ubuntu1) maverick; urgency=low * Merge from Debian unstable. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
