[Pkg-cli-apps-commits] [SCM] sysinfo branch, master, updated. upstream/0.7-8-g7824aa4

Chow Loong Jin hyperair at debian.org
Tue Jan 10 18:46:10 UTC 2012


The following commit has been merged in the master branch:
commit ed269253a5fe64dc386560a675ae61bd6c8f86e5
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Wed Jan 11 02:09:36 2012 +0800

    Add patch to fix NRE when /proc/cpuinfo has no bogomips
    
    Closes: #654210
    Thanks: Douglas Mencken

diff --git a/debian/patches/12-fix-nre-no-bogomips.patch b/debian/patches/12-fix-nre-no-bogomips.patch
new file mode 100644
index 0000000..60ca2ab
--- /dev/null
+++ b/debian/patches/12-fix-nre-no-bogomips.patch
@@ -0,0 +1,18 @@
+From: Douglas Mencken <dougmencken at gmail.com>
+Reviewed-By: Chow Loong Jin <hyperair at debian.org>
+Description: Fix NRE when /proc/cpuinfo has no bogomips
+Bugs-Debian: http://bugs.debian.org/654210
+Index: sysinfo/Sysinfo/CpuInfo.cs
+===================================================================
+--- sysinfo.orig/Sysinfo/CpuInfo.cs	2012-01-11 01:43:58.652934535 +0800
++++ sysinfo/Sysinfo/CpuInfo.cs	2012-01-11 02:01:40.029866402 +0800
+@@ -94,6 +94,9 @@
+ 					while ( dynamicB ) {
+ 						
+ 						temp = textread.ReadLine();
++
++						if (temp == null)
++							break;
+ 						
+ 						//frequency
+ 						if ( temp.StartsWith("cpu MHz"))
diff --git a/debian/patches/series b/debian/patches/series
index a3e035a..dc9c7ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 09-ubuntu_lsb_release.diff
 10-better_xorg_parsing.diff
 11-typo.diff
+12-fix-nre-no-bogomips.patch

-- 
sysinfo



More information about the Pkg-cli-apps-commits mailing list