[ModemManager/f22] Don't print GSM cell location at default log level (rh #1194492)

Daniel Williams dcbw at fedoraproject.org
Mon Mar 2 20:42:13 UTC 2015


commit 2af2fd86b35282ebb11256e5e192e81b70f411f4
Author: Dan Williams <dcbw at redhat.com>
Date:   Mon Mar 2 14:42:01 2015 -0600

    Don't print GSM cell location at default log level (rh #1194492)

 ...-location-don-t-print-location-info-to-sy.patch | 70 ++++++++++++++++++++++
 ModemManager.spec                                  |  7 ++-
 2 files changed, 76 insertions(+), 1 deletion(-)
---
diff --git a/0001-iface-modem-location-don-t-print-location-info-to-sy.patch b/0001-iface-modem-location-don-t-print-location-info-to-sy.patch
new file mode 100644
index 0000000..dd2c167
--- /dev/null
+++ b/0001-iface-modem-location-don-t-print-location-info-to-sy.patch
@@ -0,0 +1,70 @@
+From b17b52747b1b70d9ac6cfe0647b77f7d84efd771 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander at aleksander.es>
+Date: Fri, 26 Dec 2014 16:36:32 +0100
+Subject: [PATCH] iface-modem-location: don't print location info to syslog
+ with info level
+
+Use debug level, which has to be explicitly requested by the user.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=87498
+(cherry picked from commit 0dd707a2793c28369991377a0e09e00d3a09636f)
+---
+ src/mm-iface-modem-location.c | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/mm-iface-modem-location.c b/src/mm-iface-modem-location.c
+index 57d5f2c..f97789e 100644
+--- a/src/mm-iface-modem-location.c
++++ b/src/mm-iface-modem-location.c
+@@ -216,8 +216,8 @@ notify_gps_location_update (MMIfaceModemLocation *self,
+     const gchar *dbus_path;
+ 
+     dbus_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (self));
+-    mm_info ("Modem %s: GPS location updated",
+-             dbus_path);
++    mm_dbg ("Modem %s: GPS location updated",
++            dbus_path);
+ 
+     /* We only update the property if we are supposed to signal
+      * location */
+@@ -286,13 +286,13 @@ notify_3gpp_location_update (MMIfaceModemLocation *self,
+     const gchar *dbus_path;
+ 
+     dbus_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (self));
+-    mm_info ("Modem %s: 3GPP location updated "
+-             "(MCC: '%u', MNC: '%u', Location area code: '%lX', Cell ID: '%lX')",
+-             dbus_path,
+-             mm_location_3gpp_get_mobile_country_code (location_3gpp),
+-             mm_location_3gpp_get_mobile_network_code (location_3gpp),
+-             mm_location_3gpp_get_location_area_code (location_3gpp),
+-             mm_location_3gpp_get_cell_id (location_3gpp));
++    mm_dbg ("Modem %s: 3GPP location updated "
++            "(MCC: '%u', MNC: '%u', Location area code: '%lX', Cell ID: '%lX')",
++            dbus_path,
++            mm_location_3gpp_get_mobile_country_code (location_3gpp),
++            mm_location_3gpp_get_mobile_network_code (location_3gpp),
++            mm_location_3gpp_get_location_area_code (location_3gpp),
++            mm_location_3gpp_get_cell_id (location_3gpp));
+ 
+     /* We only update the property if we are supposed to signal
+      * location */
+@@ -403,11 +403,11 @@ notify_cdma_bs_location_update (MMIfaceModemLocation *self,
+     const gchar *dbus_path;
+ 
+     dbus_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (self));
+-    mm_info ("Modem %s: CDMA BS location updated "
+-             "(Longitude: '%lf', Latitude: '%lf')",
+-             dbus_path,
+-             mm_location_cdma_bs_get_longitude (location_cdma_bs),
+-             mm_location_cdma_bs_get_latitude (location_cdma_bs));
++    mm_dbg ("Modem %s: CDMA BS location updated "
++            "(Longitude: '%lf', Latitude: '%lf')",
++            dbus_path,
++            mm_location_cdma_bs_get_longitude (location_cdma_bs),
++            mm_location_cdma_bs_get_latitude (location_cdma_bs));
+ 
+     /* We only update the property if we are supposed to signal
+      * location */
+-- 
+2.1.0
+
diff --git a/ModemManager.spec b/ModemManager.spec
index ab58c07..5592bd5 100644
--- a/ModemManager.spec
+++ b/ModemManager.spec
@@ -7,7 +7,7 @@
 Summary: Mobile broadband modem management service
 Name: ModemManager
 Version: 1.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 #
 # Source from http://freedesktop.org/software/ModemManager/
 #
@@ -34,6 +34,7 @@ BuildRequires: vala-tools vala-devel
 BuildRequires: dbus
 
 Patch0: buildsys-hates-openpty.patch
+Patch1: 0001-iface-modem-location-don-t-print-location-info-to-sy.patch
 
 %description
 The ModemManager service manages WWAN modems and provides a consistent API for
@@ -83,6 +84,7 @@ Vala bindings for ModemManager
 %prep
 %setup -q
 %patch0 -p1 -b .pty
+%patch1 -p1 -b .dont-print-location
 
 %build
 
@@ -170,6 +172,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/vala/vapi/libmm-glib.*
 
 %changelog
+* Mon Mar  2 2015 Dan Williams <dcbw at redhat.com> - 1.4.4-2
+- Don't print location information in logs (rh #1194492)
+
 * Wed Feb 11 2015 Lubomir Rintel <lkundrak at v3.sk> - 1.4.4-1
 - Update to 1.4.4 release
 


More information about the scm-commits mailing list