r23684 - in /desktop/unstable/gconf/debian: changelog gconf-schemas

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Apr 10 08:10:56 2010
New Revision: 23684

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23684
Log:
gconf-schemas: don’t error out if there are no schemas to install. 
Closes: #577142.

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

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=23684&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Sat Apr 10 08:10:56 2010
@@ -1,6 +1,7 @@
 gconf (2.28.1-3) unstable; urgency=low
 
-  * gconf-schemas: drop useless check. Closes: #577142.
+  * gconf-schemas: don’t error out if there are no schemas to install. 
+    Closes: #577142.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 10 Apr 2010 09:55:19 +0200
 

Modified: desktop/unstable/gconf/debian/gconf-schemas
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf-schemas?rev=23684&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gconf-schemas [utf-8] (original)
+++ desktop/unstable/gconf/debian/gconf-schemas [utf-8] Sat Apr 10 08:10:56 2010
@@ -56,26 +56,27 @@
     os.remove(os.path.join(defaults_dest,f))
   open(os.path.join(defaults_dest,"%gconf-tree.xml"),"w").close()
 
-tmp_home=tempfile.mkdtemp(prefix='gconf-')
-env={'HOME': tmp_home,
-     'GCONF_CONFIG_SOURCE': 'xml:readwrite:'+defaults_dest}
-if options.register:
-  arg='--makefile-install-rule'
-else:
-  arg='--makefile-uninstall-rule'
+if schemas:
+    tmp_home=tempfile.mkdtemp(prefix='gconf-')
+    env={'HOME': tmp_home,
+         'GCONF_CONFIG_SOURCE': 'xml:readwrite:'+defaults_dest}
+    if options.register:
+      arg='--makefile-install-rule'
+    else:
+      arg='--makefile-uninstall-rule'
 
-fd = os.open("/dev/null",os.O_WRONLY)
-save_stdout=os.dup(1)
-os.dup2(fd,1)
-os.close(fd)
-res=os.spawnvpe(os.P_WAIT,'gconftool-2',['gconftool-2',arg]+schemas,env)
-os.dup2(save_stdout,1)
-os.close(save_stdout)
+    fd = os.open("/dev/null",os.O_WRONLY)
+    save_stdout=os.dup(1)
+    os.dup2(fd,1)
+    os.close(fd)
+    res=os.spawnvpe(os.P_WAIT,'gconftool-2',['gconftool-2',arg]+schemas,env)
+    os.dup2(save_stdout,1)
+    os.close(save_stdout)
 
-shutil.rmtree(tmp_home)
+    shutil.rmtree(tmp_home)
 
-if(res):
-  sys.exit(res)
+    if(res):
+      sys.exit(res)
 
 if options.register and options.signal:
   # tell running processes to re-read the GConf database