[Pkg-utopia-commits] r2058 - in /packages/unstable/networkmanager/debian: changelog patches/27-dont_repeat_errors.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jan 24 23:09:01 2008
New Revision: 2058

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2058
Log:
* debian/patches/27-dont_repeat_errors.patch
  - Backported r3160 from upstream stable branch.
  - Don't repeat killswitch errors too often. (Closes: #456363)

Added:
    packages/unstable/networkmanager/debian/patches/27-dont_repeat_errors.patch
Modified:
    packages/unstable/networkmanager/debian/changelog

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=2058&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Thu Jan 24 23:09:01 2008
@@ -15,8 +15,11 @@
   * debian/patches/13-validate_mac_addr.patch
     - Drop APs with an invalid MAC address. (Closes: #461500)
       Thanks to Sjoerd Simons for the patch.
-
- -- Michael Biebl <biebl at debian.org>  Thu, 24 Jan 2008 22:49:09 +0100
+  * debian/patches/27-dont_repeat_errors.patch
+    - Backported r3160 from upstream stable branch.
+    - Don't repeat killswitch errors too often. (Closes: #456363)
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 25 Jan 2008 00:07:19 +0100
 
 network-manager (0.6.5-4) unstable; urgency=low
 

Added: packages/unstable/networkmanager/debian/patches/27-dont_repeat_errors.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/patches/27-dont_repeat_errors.patch?rev=2058&op=file
==============================================================================
--- packages/unstable/networkmanager/debian/patches/27-dont_repeat_errors.patch (added)
+++ packages/unstable/networkmanager/debian/patches/27-dont_repeat_errors.patch Thu Jan 24 23:09:01 2008
@@ -1,0 +1,37 @@
+diff --git a/src/NetworkManager.c b/src/NetworkManager.c
+index 4f89f63..ddb5a4a 100644
+--- a/src/NetworkManager.c
++++ b/src/NetworkManager.c
+@@ -65,6 +65,8 @@
+  */
+ static NMData		*nm_data = NULL;
+ 
++char *ks_err_message = NULL;
++
+ static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer data);
+ static void nm_data_free (NMData *data);
+ static gboolean nm_poll_killswitches(gpointer user_data);
+@@ -353,13 +355,21 @@ static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData * da
+ 	if (message_is_error (reply)) {
+ 		dbus_error_init (&err);
+ 		dbus_set_error_from_message (&err, reply);
+-		nm_info ("Error getting killswitch power: %s - %s", err.name, err.message);
++		if (!ks_err_message || strcmp (ks_err_message, err.message)) {
++			nm_info ("Error getting killswitch power: %s - %s", err.name, err.message);
++			g_free (ks_err_message);
++			ks_err_message = g_strdup (err.message);
++		}
+ 		dbus_error_free (&err);
+ 		goto out;
+ 	}
+ 
+ 	if (!dbus_message_get_args (reply, &err, DBUS_TYPE_INT32, &status, DBUS_TYPE_INVALID)) {
+-		nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message);
++		if (!ks_err_message || strcmp (ks_err_message, err.message)) {
++			nm_info ("Error getting killswitch power arguments: %s - %s", err.name, err.message);
++			g_free (ks_err_message);
++			ks_err_message = g_strdup (err.message);
++		}
+ 		dbus_error_free (&err);
+ 		goto out;
+ 	}