snappy-hwe-snaps

Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:xenial/1.2.3/fix-cast-crash into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2

  1. Git
  2. lp:~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager
  3. xenial/1.2.3/fix-cast-crash
  4. Merge into network-manager/xenial/1.2.2
Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Simon Fels
Approved revision: 2fefbe02e3478ca3736454b6454e2ccc8e025252
Merged at revision: c8f24a044f0b7c0969f3e8979ce791697a41a829
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:xenial/1.2.3/fix-cast-crash
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2
Diff against target: 22 lines (+2/-2)
1 file modified
src/devices/wwan/nm-device-modem.c (+2/-2)
Reviewer Review Type Date Requested Status
Tony Espy Approve
Simon Fels Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+309967@code.launchpad.net

Commit message

Upstream fix for crash that can happen if modem fails to connect, for some error codes

Description of the change

Upstream fix for crash that can happen if modem fails to connect, for some error codes

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:2fefbe02e3478ca3736454b6454e2ccc8e025252
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/256/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/158/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/256/rebuild

review: Approve (continuous-integration)
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve
Revision history for this message
Tony Espy (awe) wrote :

+1

Let's hold off on publishing a new version of the snap to stable until we run this past Alex, as we're building the first A-Rev candidate on Monday.

review: Approve
Revision history for this message
Simon Fels (morphis) wrote :

@Tony: I will merge this but wont publish to candidate or stable. This will just go into edge and beta. If we need another fix for A-rev we can easily do a sub-revision release of the existing snap in stable.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
2index a8361c4..0959d2d 100644
3--- a/src/devices/wwan/nm-device-modem.c
4+++ b/src/devices/wwan/nm-device-modem.c
5@@ -334,7 +334,7 @@ device_state_changed (NMDevice *device,
6 {
7 NMDeviceModem *self = NM_DEVICE_MODEM (device);
8 NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (device);
9- NMConnection *connection = nm_device_get_applied_connection (device);
10+ NMSettingsConnection *connection = nm_device_get_settings_connection (device);
11
12 g_assert (priv->modem);
13
14@@ -361,7 +361,7 @@ device_state_changed (NMDevice *device,
15 * where a retry attempt would just fail again.
16 */
17 if (connection)
18- nm_settings_connection_set_autoconnect_blocked_reason (NM_SETTINGS_CONNECTION (connection), reason);
19+ nm_settings_connection_set_autoconnect_blocked_reason (connection, reason);
20 break;
21 default:
22 break;

Subscribers

People subscribed via source and target branches