diff options
| author | Michael Biebl <biebl@debian.org> | 2008-01-24 23:09:01 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2008-01-24 23:09:01 +0000 |
| commit | a450971ec0fd237ad7984a936d4d04a4da0f1e67 (patch) | |
| tree | 01fa3793c9eaadad00f7e57dd7aa6c3aaa59e280 | |
| parent | 650bce9abb175131d9494880baf1d5b6877b75be (diff) | |
* debian/patches/27-dont_repeat_errors.patch
- Backported r3160 from upstream stable branch. - Don't repeat killswitch errors too often. (Closes: #456363) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2058 ceb527fc-18e6-0310-9fe2-813c157c29e7
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/27-dont_repeat_errors.patch | 37 |
2 files changed, 41 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 6d4ed972..e7e19f3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,11 @@ network-manager (0.6.5-5) UNRELEASED; urgency=low * debian/patches/13-validate_mac_addr.patch - Drop APs with an invalid MAC address. (Closes: #461500) Thanks to Sjoerd Simons for the patch. + * 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@debian.org> Thu, 24 Jan 2008 22:49:09 +0100 + -- Michael Biebl <biebl@debian.org> Fri, 25 Jan 2008 00:07:19 +0100 network-manager (0.6.5-4) unstable; urgency=low diff --git a/debian/patches/27-dont_repeat_errors.patch b/debian/patches/27-dont_repeat_errors.patch new file mode 100644 index 00000000..64e23223 --- /dev/null +++ b/debian/patches/27-dont_repeat_errors.patch @@ -0,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; + } |