r18300 - in /desktop/experimental/gconf/debian: changelog update-gconf-defaults

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Jan 29 16:28:47 2009
New Revision: 18300

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18300
Log:
update-gconf-defaults: ignore more backup extensions.
Closes: #512476.

Modified:
    desktop/experimental/gconf/debian/changelog
    desktop/experimental/gconf/debian/update-gconf-defaults

Modified: desktop/experimental/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/changelog?rev=18300&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/changelog (original)
+++ desktop/experimental/gconf/debian/changelog Thu Jan 29 16:28:47 2009
@@ -7,6 +7,10 @@
   [ Loic Minier ]
   * Change the postinst to explicitely install the alternative on install and
     upgrades from << 2.19.1-2.
+
+  [ Josselin Mouette ]
+  * update-gconf-defaults: ignore more backup extensions.
+    Closes: #512476.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 16 Nov 2008 16:46:42 +0100
 

Modified: desktop/experimental/gconf/debian/update-gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/update-gconf-defaults?rev=18300&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/update-gconf-defaults (original)
+++ desktop/experimental/gconf/debian/update-gconf-defaults Thu Jan 29 16:28:47 2009
@@ -107,9 +107,10 @@
 defaults_files.sort()
 for f in defaults_files:
   realname=defaults_dir+'/'+f
-  if f.endswith('.dpkg-tmp'):
-    pass
-  elif f.endswith('.entries'):
+  for ext in ['.dpkg-tmp', '.bak', '.tmp', '~', '.sav', '.save']:
+    if f.endswith(ext):
+      continue
+  if f.endswith('.entries'):
     if gconf_val:
       write_and_apply_entries(tmp_file)
       gconf_val={}