r32670 - in /desktop/unstable/gconf/debian: changelog gconf-schemas update-gconf-defaults

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Feb 23 21:13:01 2012
New Revision: 32670

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32670
Log:
gconf-schemas, update-gconf-defaults: don’t purge the environment 
entirely. Closes: #636083.

Modified:
    desktop/unstable/gconf/debian/changelog
    desktop/unstable/gconf/debian/gconf-schemas
    desktop/unstable/gconf/debian/update-gconf-defaults

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=32670&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Thu Feb 23 21:13:01 2012
@@ -35,6 +35,8 @@
   * Move the API documentation to libgconf2-doc.
   * Get rid of the symlink for documentation.
   * Remove unused gnome-version.mk.
+  * gconf-schemas, update-gconf-defaults: don’t purge the environment 
+    entirely. Closes: #636083.
 
  -- Josselin Mouette <joss at debian.org>  Thu, 23 Feb 2012 21:56:45 +0100
 

Modified: desktop/unstable/gconf/debian/gconf-schemas
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf-schemas?rev=32670&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gconf-schemas [utf-8] (original)
+++ desktop/unstable/gconf/debian/gconf-schemas [utf-8] Thu Feb 23 21:13:01 2012
@@ -58,8 +58,9 @@
 
 if schemas:
     tmp_home=tempfile.mkdtemp(prefix='gconf-')
-    env={'HOME': tmp_home,
-         'GCONF_CONFIG_SOURCE': 'xml:readwrite:'+defaults_dest}
+    env=os.environ.copy()
+    env['HOME'] = tmp_home
+    env['GCONF_CONFIG_SOURCE'] = 'xml:readwrite:'+defaults_dest
     if options.register:
       arg='--makefile-install-rule'
     else:

Modified: desktop/unstable/gconf/debian/update-gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/update-gconf-defaults?rev=32670&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/update-gconf-defaults [utf-8] (original)
+++ desktop/unstable/gconf/debian/update-gconf-defaults [utf-8] Thu Feb 23 21:13:01 2012
@@ -81,10 +81,12 @@
   return m
 
 def apply_entries(filename):
+  env=os.environ.copy()
+  env['HOME'] = tmp_home
   res=os.spawnvpe(os.P_WAIT,'gconftool-2',
            ['gconftool-2','--direct','--config-source',
             'xml:merged:'+tmp_gconf,'--load',filename],
-           {'HOME': tmp_home})
+           env)
   if res:
     cleanup()
     sys.exit(res)