[Pkg-fglrx-devel] r497 - fglrx-driver/trunk/debian

[Patrick Matthäi]

Author: pmatthaei
Date: 2010-10-31 10:08:58 +0000 (Sun, 31 Oct 2010)
New Revision: 497

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-driver.postinst
Log:
* Do not fail at mv_conffile, if the user has removed the old configuration
  files.
  Closes: #601326


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-10-31 09:33:40 UTC (rev 496)
+++ fglrx-driver/trunk/debian/changelog	2010-10-31 10:08:58 UTC (rev 497)
@@ -7,8 +7,11 @@
   * Add patch 04-2.6.36-support.diff from Balázs Hámorszky for adding Linux
     2.6.36 support.
     Closes: #598654
+  * Do not fail at mv_conffile, if the user has removed the old configuration
+    files.
+    Closes: #601326
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 31 Oct 2010 10:22:10 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 31 Oct 2010 11:07:30 +0100
 
 fglrx-driver (1:10-9-3) unstable; urgency=high
 

Modified: fglrx-driver/trunk/debian/fglrx-driver.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.postinst	2010-10-31 09:33:40 UTC (rev 496)
+++ fglrx-driver/trunk/debian/fglrx-driver.postinst	2010-10-31 10:08:58 UTC (rev 497)
@@ -18,7 +18,7 @@
 # Move a conffile without triggering a dpkg question
 # from http://wiki.debian.org/DpkgConffileHandling
 mv_conffile() {
-	if [ -e $1 ]; then
+	if [ -e $1 -a -e $2 ]; then
 		echo "Preserving user changes to $2 ..."
 		mv -f $2 $2.dpkg-new
 		mv -f $1 $2