← Back to branch summary

~network-manager/network-manager/ubuntu.hardy.07

« back to all changes in this revision

Viewing changes to debian/patches/honour_resolvconf_exitcode.patch

(merge) RELEASE 0.7~~svn20080928t225540+eni0-0ubuntu1 to ubuntu/intrepid

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/honour_resolvconf_exitcode.patch
1
 
=== modified file 'src/named-manager/nm-named-manager.c'
2
 
--- a/src/named-manager/nm-named-manager.c      2008-09-05 18:57:07 +0000
3
 
+++ b/src/named-manager/nm-named-manager.c      2008-09-09 13:58:11 +0000
4
 
@@ -286,17 +286,17 @@ dispatch_resolvconf (const char *domain,
5
 
                        g_set_error (error,
6
 
                                     NM_NAMED_MANAGER_ERROR,
7
 
                                     NM_NAMED_MANAGER_ERROR_SYSTEM,
8
 
                                     "Could not write to %s: %s\n",
9
 
                                     RESOLVCONF_PATH,
10
 
                                     g_strerror (errno));
11
 
                else {
12
 
                        retval = write_resolv_conf (f, domain, searches, nameservers, error);
13
 
-                       pclose (f);
14
 
+                       retval &= pclose (f) == 0;
15
 
                }
16
 
        } else {
17
 
                cmd = g_strconcat (RESOLVCONF_PATH, " -d ", "NetworkManager", NULL);
18
 
                nm_info ("(%s): removing resolv.conf from %s", iface, RESOLVCONF_PATH);
19
 
                if (nm_spawn_process (cmd) == 0)
20
 
                        retval = TRUE;
21
 
        }
22
 
 
23