diff options
| author | Ray Strode <rstrode@redhat.com> | 2007-03-02 20:14:09 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@src.gnome.org> | 2007-03-02 20:14:09 +0000 |
| commit | 84c43fec319cc5f7143f7b673f2a005ed44bb0d8 (patch) | |
| tree | 087f946fbc4259e92c9c32f1779f4f935e2d1c5e | |
| parent | e339b2f4d92dcda63a6e973e8c22206982d66a60 (diff) | |
| download | gconf-84c43fec319cc5f7143f7b673f2a005ed44bb0d8.tar.gz | |
Patch from Laszlo (Laca) Peter <laszlo.peter@sun.com>
2007-03-02 Ray Strode <rstrode@redhat.com>
Patch from
Laszlo (Laca) Peter <laszlo.peter@sun.com>
* gconf/gconftool.c (do_makefile_install):
don't bail on first error when multiple schemas are
installed in one go (bug 385142).
svn path=/trunk/; revision=2374
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gconf/gconftool.c | 7 |
2 files changed, 14 insertions, 2 deletions
@@ -1,6 +1,15 @@ 2007-03-02 Ray Strode <rstrode@redhat.com> Patch from + Laszlo (Laca) Peter <laszlo.peter@sun.com> + + * gconf/gconftool.c (do_makefile_install): + don't bail on first error when multiple schemas are + installed in one go (bug 385142). + +2007-03-02 Ray Strode <rstrode@redhat.com> + + Patch from Padraig O'Briain <padraig.obriain@sun.com> * configure.in: diff --git a/gconf/gconftool.c b/gconf/gconftool.c index caa0713e..5c413693 100644 --- a/gconf/gconftool.c +++ b/gconf/gconftool.c @@ -3764,6 +3764,8 @@ do_sync(GConfEngine* conf) static int do_makefile_install(GConfEngine* conf, const gchar** args, gboolean unload) { + int retval = 0; + if (args == NULL) { g_printerr (_("Must specify some schema files to install\n")); @@ -3773,12 +3775,13 @@ do_makefile_install(GConfEngine* conf, const gchar** args, gboolean unload) while (*args) { if (do_load_file(conf, LOAD_SCHEMA_FILE, unload, *args, NULL) != 0) - return 1; + retval |= 1; ++args; } - return do_sync (conf); + retval |= do_sync (conf); + return retval; } typedef enum { |