[Fusionforge-commits] r11059 - in branches/Branch_5_0/gforge: deb-specific debian

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Oct 19 20:31:58 CEST 2010


Author: lolando
Date: 2010-10-19 20:31:58 +0200 (Tue, 19 Oct 2010)
New Revision: 11059

Modified:
   branches/Branch_5_0/gforge/deb-specific/install-postfix.sh
   branches/Branch_5_0/gforge/debian/changelog
Log:
Fixed hang during removal of -mta-postfix in some conditions

Modified: branches/Branch_5_0/gforge/deb-specific/install-postfix.sh
===================================================================
--- branches/Branch_5_0/gforge/deb-specific/install-postfix.sh	2010-10-19 18:14:40 UTC (rev 11058)
+++ branches/Branch_5_0/gforge/deb-specific/install-postfix.sh	2010-10-19 18:31:58 UTC (rev 11059)
@@ -178,7 +178,7 @@
 print "$l\n" ;
 while ($l = <>) { print $l; };
 ' < /etc/postfix/main.cf.gforge-new > $tmp1
-	perl -i -e '
+	grep -q '^[[:space:]]*relay_domains' $tmp1 && perl -i -e '
 require ("/etc/gforge/local.pl") ;
 while (($l = <>) !~ /^\s*relay_domains/) {
   print $l;

Modified: branches/Branch_5_0/gforge/debian/changelog
===================================================================
--- branches/Branch_5_0/gforge/debian/changelog	2010-10-19 18:14:40 UTC (rev 11058)
+++ branches/Branch_5_0/gforge/debian/changelog	2010-10-19 18:31:58 UTC (rev 11059)
@@ -2,8 +2,10 @@
 
   * Fixed Mediawiki creation script so it uses the appropriate database
     and user (closes: #600605).
+  * Fixed hang during removal of -mta-postfix in some conditions (closes:
+    #600583).
 
- -- Roland Mas <lolando at debian.org>  Tue, 19 Oct 2010 20:13:36 +0200
+ -- Roland Mas <lolando at debian.org>  Tue, 19 Oct 2010 20:31:12 +0200
 
 fusionforge (5.0.2-2) unstable; urgency=low
 




More information about the Fusionforge-commits mailing list