Re: backporting GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL

[Frederic Crozat <fcrozat mandrakesoft com>]

Le mar 26/03/2002 à 15:27, Havoc Pennington a écrit :
> 
> Frederic Crozat <fcrozat mandrakesoft com> writes:
> > 
> > I'd like to backport the GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL variable
> > test in GConf stable branch for next GConf 1.0.x release, in order to
> > get a consistent behaviour between GConf 1.0.x and GConf 1.1.x (and get
> > more simple specfile too :))
> > 
> > WDYT ?
> 
> Sure, that makes sense.

Ok, here is the patch (grabber from HEAD). Can I commit ?

-- 
Frédéric Crozat
MandrakeSoft

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gconf/ChangeLog,v
retrieving revision 1.232.2.66
diff -u -r1.232.2.66 ChangeLog
--- ChangeLog	24 Mar 2002 01:50:56 -0000	1.232.2.66
+++ ChangeLog	26 Mar 2002 14:42:24 -0000
@@ -1,3 +1,9 @@
+2002-03-26  Frederic Crozat  <fcrozat mandrakesoft com>
+
+	* gconf/gconftool.c: (main): back from HEAD (honor
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL to do nothing for
+	--makefile-install-mode)
+
 2002-03-23  Havoc Pennington  <hp pobox com>
 
 	* gconf/gconfd.c (gconf_main): change exit timeout to 2 minutes
Index: gconf/gconftool.c
===================================================================
RCS file: /cvs/gnome/gconf/gconf/gconftool.c,v
retrieving revision 1.51.2.12
diff -u -r1.51.2.12 gconftool.c
--- gconf/gconftool.c	4 Dec 2001 22:16:46 -0000	1.51.2.12
+++ gconf/gconftool.c	26 Mar 2002 14:42:24 -0000
@@ -553,6 +553,13 @@
       else
         return 0;
     }
+
+  if (makefile_install_mode &&
+      g_getenv ("GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL"))
+    {
+      g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"));
+      makefile_install_mode = FALSE;
+    }
   
   if (makefile_install_mode)
     {