[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r2673 - in glibc-package/branches/glibc-2.7/debian: . debhelper.in



Author: aurel32
Date: 2007-11-16 14:32:26 +0000 (Fri, 16 Nov 2007)
New Revision: 2673

Modified:
   glibc-package/branches/glibc-2.7/debian/changelog
   glibc-package/branches/glibc-2.7/debian/debhelper.in/locales-all.postinst
Log:
  * debhelper.in/locales-all.postinst: trap exit signal and remove temporary
    directory.  Closes: #447328.



Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog	2007-11-16 14:23:52 UTC (rev 2672)
+++ glibc-package/branches/glibc-2.7/debian/changelog	2007-11-16 14:32:26 UTC (rev 2673)
@@ -104,6 +104,8 @@
   * debian/patches/arm/local-eabi-wchar.diff: new patch from Riku Voipio to
     fiw WCHAR_MIN and WCHAR_MAX definitions on armel.  Closes: #444580.
   * debian/po/zh_CN.po: update from LI Daobing. Closes: #447866.
+  * debhelper.in/locales-all.postinst: trap exit signal and remove temporary
+    directory.  Closes: #447328.
 
   [ Petr Salinger]
   * any/local-linuxthreads-unwind.diff: provide unwind-resume routine for
@@ -127,7 +129,7 @@
   [ Samuel Thibault ]
   * hurd-i386/submitted-ptr-mangle.diff: Define PTR_MANGLE for assembly.
 
- -- Aurelien Jarno <aurel32@debian.org>  Fri, 16 Nov 2007 15:22:55 +0100
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 16 Nov 2007 15:31:22 +0100
 
 glibc (2.6.1-6) unstable; urgency=low
 

Modified: glibc-package/branches/glibc-2.7/debian/debhelper.in/locales-all.postinst
===================================================================
--- glibc-package/branches/glibc-2.7/debian/debhelper.in/locales-all.postinst	2007-11-16 14:23:52 UTC (rev 2672)
+++ glibc-package/branches/glibc-2.7/debian/debhelper.in/locales-all.postinst	2007-11-16 14:32:26 UTC (rev 2673)
@@ -8,9 +8,9 @@
 	#  overwrite them and exits with a non-null value
 	rm -f /usr/lib/locale/locale-archive 2>/dev/null || true
 	tmpdir=$(mktemp -d /tmp/locales.XXXXXXXXXX)
+	trap 'rm -rf "$tmpdir" > /dev/null 2>&1' exit
 	tar --use-compress-program /usr/bin/lzma -xf /usr/lib/locales-all/supported.tar.lzma -C "$tmpdir"
 	localedef --quiet --add-to-archive "$tmpdir"/*
-	rm -rf "$tmpdir"
 fi
 
 #DEBHELPER#



Reply to: