packages: dovecot/dovecot.spec - prefix stderr with hash in trigger (pawelz)

[arekm]

Author: arekm                        Date: Sun Sep 26 17:58:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- prefix stderr with hash in trigger (pawelz)

---- Files affected:
packages/dovecot:
   dovecot.spec (1.148 -> 1.149) 

---- Diffs:

================================================================
Index: packages/dovecot/dovecot.spec
diff -u packages/dovecot/dovecot.spec:1.148 packages/dovecot/dovecot.spec:1.149
--- packages/dovecot/dovecot.spec:1.148	Sat Sep 18 22:26:06 2010
+++ packages/dovecot/dovecot.spec	Sun Sep 26 19:58:37 2010
@@ -230,9 +230,14 @@
 		[ "$i" -eq 0 ] && echo "Read http://wiki2.dovecot.org/Upgrading/2.0"
 		i=1
 		echo "Trying to migrate $a config file to dovecot 2."
-		cp -a "$a" "$a-1.2.org" && %{_bindir}/doveconf -n -c "$a-1.2.org" > "$a" 2>&1 || :
+		cp -a "$a" "$a-1.2.org"
+		# convert config and prefix stderr lines with #
+		( %{_bindir}/doveconf -n -c "$a-1.2.org" 3>&2 2>&1 1>&3 | sed 's/^/#/' ) 2>&1 > "$a" || :
 	fi
 done
+if [ "$i" -eq 1 ]; then
+	echo "Please verify contents of %{_sysconfdir}/%{name}/* files."
+fi
 
 %files
 %defattr(644,root,root,755)
@@ -306,6 +311,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.149  2010/09/26 17:58:37  arekm
+- prefix stderr with hash in trigger (pawelz)
+
 Revision 1.148  2010/09/18 20:26:06  arekm
 - keep trigger errors
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dovecot/dovecot.spec?r1=1.148&r2=1.149&f=u