diff options
| author | David Farning <dfarning@dextrose.sugarlabs.org> | 2010-08-09 16:52:04 (GMT) |
|---|---|---|
| committer | David Farning <dfarning@dextrose.sugarlabs.org> | 2010-08-09 16:52:04 (GMT) |
| commit | 7a06cbdb82dbe47c07672161a8b61513a0437b3c (patch) | |
| tree | e5fa9e5765a7f24bfcb2264ebac6cc43534a51ed /rpms | |
| parent | f0ada2ff3ce38ff729b9a770da4e626c2ef9d7d1 (diff) | |
Push register-session-failed-fix.patch
Diffstat (limited to 'rpms')
| -rw-r--r-- | rpms/sugar/register-session-failed-fix.patch | 38 | ||||
| -rw-r--r-- | rpms/sugar/sugar.spec | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/rpms/sugar/register-session-failed-fix.patch b/rpms/sugar/register-session-failed-fix.patch new file mode 100644 index 0000000..45d082c --- /dev/null +++ b/rpms/sugar/register-session-failed-fix.patch @@ -0,0 +1,38 @@ +Martin Langhoff patch to solve registration session register failure. +side effects. + +--- + src/jarabe/model/network.py | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py +index 47db43f..218752c 100644 +--- a/src/jarabe/model/network.py ++++ b/src/jarabe/model/network.py +@@ -27,6 +27,7 @@ import dbus.service + import gobject + import ConfigParser + import gconf ++import ctypes + + from sugar import dispatch + from sugar import env +@@ -369,6 +370,16 @@ class NMSettingsConnection(dbus.service.Object): + if self._settings.connection.type == NM_CONNECTION_TYPE_802_11_WIRELESS: + self.save() + ++ try: ++ # try to flush resolver cache - SL#1940 ++ # ctypes' syntactic sugar does not work ++ # so we must get the func ptr explicitly ++ libc = ctypes.CDLL('libc.so.6') ++ res_init = getattr(libc, '__res_init') ++ res_init(None) ++ except: ++ logging.error('Error calling libc.__res_init') ++ + def set_secrets(self, secrets): + self._secrets = secrets + if self._settings.connection.type == NM_CONNECTION_TYPE_802_11_WIRELESS: +-- + diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec index aba5d79..1863cb3 100644 --- a/rpms/sugar/sugar.spec +++ b/rpms/sugar/sugar.spec @@ -32,6 +32,7 @@ Patch19: improve-activity-updater-icon.patch Patch20: indicate-inactive-state-in-mesh-device-icon.patch Patch21: discard_network_connections.patch #Patch22: sl1814-consolidate-activity-launch-entry-point.patch +Patch23: register-session-failed-fix.patch # Andres' journal filesize enhancement Patch101: sizelist-0001-Journal-Retrieve-filesize-from-the-datastore.patch |