[Gforge-commits] gforge/debian/dsf-helper replace-files.prerm, 1.3, 1.3.2.1 replace-files.postinst, 1.3, 1.3.2.1

[lo-lan-do]

Update of /cvsroot/gforge/gforge/debian/dsf-helper
In directory db.perdue.net:/tmp/cvs-serv22197/debian/dsf-helper

Modified Files:
      Tag: Branch_3_1
        replace-files.prerm replace-files.postinst 
Log Message:
Do not propose anything if no new file is present.


Index: replace-files.prerm
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/dsf-helper/replace-files.prerm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- replace-files.prerm 23 Dec 2002 13:17:13 -0000      1.3
+++ replace-files.prerm 10 Jan 2004 21:44:29 -0000      1.3.2.1
@@ -13,7 +13,9 @@
     file=$1
     mode=$2
     template=gforge/shared/replace_file_$mode
-    if diff -q ${file} ${file}.gforge-new > /dev/null 2>&1 ; then
+    if [ ! -e ${file}.gforge-new ] ; then
+        echo "${file} already configured, not changing."
+    elif diff -q ${file} ${file}.gforge-new > /dev/null 2>&1 ; then
         # Old file and new file are identical
         rm -f ${file}.gforge-new
     else

Index: replace-files.postinst
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/dsf-helper/replace-files.postinst,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- replace-files.postinst      23 Dec 2002 13:17:13 -0000      1.3
+++ replace-files.postinst      10 Jan 2004 21:44:29 -0000      1.3.2.1
@@ -13,7 +13,9 @@
     file=$1
     mode=$2
     template=gforge/shared/replace_file_$mode
-    if diff -q ${file} ${file}.gforge-new > /dev/null 2>&1 ; then
+    if [ ! -e ${file}.gforge-new ] ; then
+        echo "${file} already configured, not changing."
+    elif diff -q ${file} ${file}.gforge-new > /dev/null 2>&1 ; then
         # Old file and new file are identical
         rm -f ${file}.gforge-new
     else