[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gforge-commits] gforge/debian/dsf-helper replace-files.prerm, 1.3, 1.4
From: |
lo-lan-do |
Subject: |
[Gforge-commits] gforge/debian/dsf-helper replace-files.prerm, 1.3, 1.4 replace-files.postinst, 1.3, 1.4 |
Date: |
Sat, 10 Jan 2004 16:14:08 -0600 |
Update of /cvsroot/gforge/gforge/debian/dsf-helper
In directory db.perdue.net:/tmp/cvs-serv23776/debian/dsf-helper
Modified Files:
replace-files.prerm replace-files.postinst
Log Message:
Merging Branch_3_1 back into the trunk (at tag Branch_3_1-merge_3).
Index: replace-files.prerm
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/dsf-helper/replace-files.prerm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- replace-files.prerm 23 Dec 2002 13:17:13 -0000 1.3
+++ replace-files.prerm 10 Jan 2004 22:14:05 -0000 1.4
@@ -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.4
diff -u -d -r1.3 -r1.4
--- replace-files.postinst 23 Dec 2002 13:17:13 -0000 1.3
+++ replace-files.postinst 10 Jan 2004 22:14:05 -0000 1.4
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gforge-commits] gforge/debian/dsf-helper replace-files.prerm, 1.3, 1.4 replace-files.postinst, 1.3, 1.4,
lo-lan-do <=
- Prev by Date:
[Gforge-commits] gforge/debian rules, 1.68, 1.69 gforge-web-apache.postinst.dsfh-in, 1.8, 1.9 gforge-ldap-openldap.postinst.dsfh-in, 1.9, 1.10 gforge-db-postgresql.cron.d, 1.5, 1.6 control, 1.51, 1.52 changelog, 1.358, 1.359
- Next by Date:
[Gforge-commits] gforge/deb-specific install-ldap.sh, 1.58, 1.59 install-db.sh, 1.28, 1.29 install-apache.sh, 1.15, 1.16
- Previous by thread:
[Gforge-commits] gforge/debian rules, 1.68, 1.69 gforge-web-apache.postinst.dsfh-in, 1.8, 1.9 gforge-ldap-openldap.postinst.dsfh-in, 1.9, 1.10 gforge-db-postgresql.cron.d, 1.5, 1.6 control, 1.51, 1.52 changelog, 1.358, 1.359
- Next by thread:
[Gforge-commits] gforge/deb-specific install-ldap.sh, 1.58, 1.59 install-db.sh, 1.28, 1.29 install-apache.sh, 1.15, 1.16
- Index(es):